Ellié Computing Merge

Contents

• Introduction
  • Overview of Ellié Computing Merge
  • Text Comparison and Merging
  • Image Comparison
  • Folder Comparison and Merging
  • Text File Edition
• Release Notes
  • What's new ?
  • Platform differences
  • Known Issues
  • Compatibility and System Requirements
• Installation
  • Installing on Windows
  • Unattended Installation for Windows
  • Installing on Mac OS X
  • Installing on Linux
  • Installing on Solaris
  • Registering the software
  • Multi-user activation
  • Portable installation
  • Uninstalling Ellié Computing Merge
• Purchasing Ellié Computing Merge
  • How to buy Ellié Computing Merge ?
  • How many licences do I need ?
  • Standard/Pro comparison chart
  • Prices
  • Bundling Ellié Computing Merge
• Tutorials
  • Tutorial 1: Synchronizing two folders
  • Advanced Tutorial 1: synchronizing my website via FTP
  • Advanced Tutorial 2: fully integrate Ellié Computing Merge with my VCS and work with an opensource project
• Comparisons (Common elements)
  • Selecting a file or folder for viewing, editing or comparing
  • Comparison Type Determination
  • Saving and continuing comparisons
• Text Comparisons
  • Two-way Text Comparison Screenshot
  • Three-way Text Comparison Screenshot
  • Moving in files
  • Resolving Conflicts
  • Editing Result File
  • Saving Result File
• Image Comparisons
  • Two-way Image Comparison Screenshot
  • Three-way Image Comparison Screenshot
  • Differentiation styles
  • Supported formats
• Folder Comparisons
  • Two-way Folder Comparison and Merge
  • Three-way Folder Comparison and Merge
  • Browsing Folders Contents
  • Resolving Conflicts
• Reference Guide
  • Dialog Boxes
    • New Comparison dialog box
    • FTP Source dialog box
    • Login/password dialog box
    • Proxy authentication dialog box
    • SCC Source Dialog Box
    • SCC Tool Dialog Box
    • SCC Mapping Dialog Box
    • SCC Comment Dialog Box
    • View and Comparison Options dialog box (Options Sets)
      • Options Sets
      • Display Options
      • Colours Options
      • Markers Options
      • Converters and File Types Options
      • Text Comparisons Options
      • Advanced Text Comparisons
      • File Merges
      • Binary Comparisons Options
      • Image Comparisons Options
      • Image Colours Options
      • Folder Comparisons Options
      • Folders Display Options
      • File Name Filters Options
      • File Status Filters
      • File Date Filters Options
      • Folder 2-way Merge Rules Options
      • Folder 3-way Merge Rules Options
      • Reports Options
      • Text Comparisons Reports Options
      • Image Comparisons Reports Options
      • Folder Comparisons Reports Options
      • Data Sources Options
    • Preferences dialog
      • Application Options
      • Options Handling
      • Command Options
      • Web Updates Options
      • Key Bindings
      • Converters Options
      • File types Options
      • FTP Options
      • Firewall / Proxy Options
      • Source Code Control Tools
      • Source Code Control Mappings
    • File Type dialog box
      • Edition Options
      • Text to Ignore
      • XML Text Comparisons
    • Comparison Statistics dialog box
    • Find dialog box
    • Replace dialog box
    • Go To Line dialog box
    • Text Input and Output dialog boxes
    • Pretty-print and Compact XML dialog boxes
    • Languages dialog box
    • Apply Merge Rules dialog box (Folders)
    • Write Merge Result dialog box (Folders)
    • Item Properties dialog box (Folders)
    • Generic Copy dialog box (Folders)
    • Reports dialog box
      • Report generation as patch
      • Report generation as XML/HTML
    • Import dialog box
    • Tabs list dialog box
    • Register dialog box
    • About dialog box
  • Messages
    • The reference copy of options set '<name>' changed in the application since the session was last activated, do you want to replace the session settings or keep them?
  • Menus
    • File Menu
    • Edit Menu
    • View Menu
    • Tabs Menu
    • Help Menu
    • Contextual Menu (Text Comparisons)
    • Contextual Menu (Image Comparisons)
    • Contextual Menu (Folder Comparisons)
  • Launcher panel
  • Toolbar Commands
  • Keyboard Shortuts
  • Regular expressions
  • Writing patterns for filenames
  • Converter Samples for text/directory handling
  • Converter Samples for image handling
• Scripting
  • User macro-commands
  • Running scripts at start-up
  • Adding menu items to the contextual menus
  • Macro settings
  • Scripting Reference
    • List of all ECMerge functions
    • List of all ECMerge objects
    • List of all ECMerge strings
    • Extensions to ECMAScript
    • Application object
    • BinaryDocument object
    • ConfigurationObject object
    • Coordinator object
    • Display Image Difference string
    • Document Access Mode string
    • Document Activity string
    • Document Format string
    • Document object
    • Document Subset string
    • Document Type string
    • Document.Parameters object
    • Document.Selection object
    • DocumentFrame object
    • Encoding string
    • EncodingProperties object
    • Environment object
    • Folder Column string
    • FolderDocument object
    • FolderDocument.Coordinator object
    • FolderDocument.Item object
    • FolderDocument.Items object
    • FolderDocument.MergeRulesSet object
    • FolderDocument.Selection object
    • FolderDocument.View object
    • Generic Copy Action string
    • GUI Type string
    • I18N object
    • Image Differentiation Style string
    • ImageDocument object
    • ImageDocument.Coordinator object
    • ImageDocument.View object
    • Item Grouping Type string
    • Item Resolution Action string
    • Item Resolution Class string
    • LinearRange object
    • Machine object
    • OptionsSet object
    • Questions/Answers string
    • Registry object
    • SerializableObject object
    • Side Couple string
    • Side string
    • SourceDescription object
    • Statistics object
    • System object
    • System.Console object
    • System.Process object
    • System.Synchronization object
    • System.Synchronization.Waitable object
    • Text Conflict State string
    • Text Decoration string
    • TextDocument object
    • TextDocument.Conflict object
    • TextDocument.Content object
    • TextDocument.Coordinator object
    • TextDocument.Difference object
    • TextDocument.InlineDifference object
    • TextDocument.Selection object
    • TextDocument.View object
    • Unix Patch Format string
    • URL object
    • UserFileType object
    • UserProcessFilter object
    • VFS object
    • VFS.Metadata object
    • View object
• How to...
  • change colouring scheme for a file extension?
  • change current document options?
  • change quickly comparisons paths?
  • combine several commands into a button?
  • compare files in proprietary formats?
  • compare or merge 2 or 3 files?
  • compare or merge 2 or 3 folders?
  • copy a folder overwriting only older files?
  • create a macro command?
  • customize bookmarks and conflict markers shape and colours?
  • disable the syntax colouring for the current text document?
  • disable the Windows Explorer context menu integration?
  • filter files from a folder comparison?
  • find or replace a block in a text file?
  • generate reports between labels or branches of a SCC or SCM?
  • ignore specific lines and portions of lines
  • manage a comparison/merge view?
  • merge and participate to open source or external projects?
  • merge files from command line with no interface?
  • navigate to the previous or next conflict or difference in a comparison view?
  • open a file comparison from a folder comparison view?
  • print background colours in Ellié Computing Merge HTML reports?
  • save a comparison status to reopen it later?
  • show or hide the ancestor for a comparison view?
  • solve conflicts?
  • swap between differentiation and merge?
  • swap the files or folders roles in a comparison view?
  • use all the options of Ellié Computing Merge from command line?
  • use bookmarks?
  • view or edit a file?
  • work with character encodings ?
  • write FTP URLs in file name text fields or when using the command line application?
• Different ways of launching Ellié Computing Merge
  • Command Line Reference
    • Command Line Syntax
    • Command Line Options and Switches
    • Specifying URLs/paths on command line
    • Integration with Configuration Management Systems
    • Generating Reports from Command Line
    • Executing Ellié Computing Merge inside a bundling application
  • Integration in Windows Explorer contextual menu
  • ActiveX Component
• Troubleshooting
  • Troubleshooting installing Ellié Computing Merge
  • Troubleshooting uninstalling Ellié Computing Merge
  • Troubleshooting report generation
• Contact Ellié Computing
  • Web site and postal address
  • Commercial contact
  • Technical Support
  • Community contacts
• Licence
  • Copyright notice
  • Additional licences