3-Way Merge Tool

Compare 3 Files

  • Compare 3 files
  • Compare 2 files
  • Edit and merge 3 files in any direction
  • Automatic back-up
  • Syntax coloring, line folding, line wrap
  • Synchronized vertical & horizontal scrolling
  • Generate diff reports
  • Unlimited undo of merged changes
  • Generate diff reports
  • Compare folders and directories
  • Compare three XML files
  • Compare databases (table structures and rows)
  • Compare Word docs and OOXML

Compare Files with DiffDog

Compare 3 files and merge them with DiffDog

Whether you need to compare two text files or compare three text files at once, DiffDog includes powerful capabilities to identify differences and let you merge them in either direction. Compare and merge any type of text-based file, with support for Unicode, ASCII, MBCS, and any other file formats. DiffDog also includes additional, XML-aware features for comparing 3 XML files.

DiffDog allows you to compare and merge files on your local drives, files on your local network, and even files on remote FTP and HTTP servers (based on user privileges). This flexibility is especially suited for comparing, maintaining, and synchronizing files on live servers with the latest updates from your local machine.

When you select three files to compare, they are opened side-by-side in the intuitive DiffDog interface. Differences between the three files are indicated by colored highlighting and connecting lines. The DiffDog display options are completely customizable, allowing you change the colors used to highlight differences and even specify source code conformant syntax coloring based on file extension.

Advanced navigation features such as synchronized horizontal and vertical scrolling allow you to move through each file without losing track of the corresponding differences in the other files.

Merge Three Files

Merge two or three files with DiffDog

DiffDog allows bi-directional, 3-way merging as well as direct editing of the three compared files. It automatically creates a backup of each file, allowing you to re-load the original file from the server or disk at anytime should you need to start over.

DiffDog also supports unlimited undo, so you can backtrack to any point in the editing and merging process. In addition, as you’re working with the three compared files, DiffDog constantly monitors the server where each file is stored, and, if it’s modified externally, reloads the most current version into the DiffDog comparison window.

As you merge changes and edit your files, DiffDog automatically re-compares the files to indicate the current differences.

Generate Diff Reports

Developers and other project stakeholders often want to keep a record of changes to source code and other important files. DiffDog can create diff reports for all comparisons of text-based files, including source code files.

The Export differences dialog lets you choose to create a diff report in text format or as an XML file. Text format reports follow the well-accepted Unix diff style. Report files in XML format are human-readable with descriptive element names and record the comparison mode and the paths of the directories compared.

DiffDog Server

To automate diff reports generation for high-volume comparisons, check out DiffDog Server.

“In no time at all, Altova DiffDog identified a minute discrepancy between our XML files that would have taken me hours to identify manually. Problem found equals problem solved – I'm a DiffDog fan for life!”

Michael Mullins, Applications Developer West Virginia Division of Natural Resources