QBzr: External Merge Tools

We want to have registry of known good external merge tools which can be used in qconflicts dialog to resolve text conflicts. If you want to see your favorite tool supported right from the box you may help us.

For each tool we need following information:

• full (title) name of the tool (put it into subsection name)
• Optionally home page URL
• list of arguments (use substitution variables as following: $THIS for file.THIS, $OTHER for file.OTHER, $BASE for file.BASE, and $RESULT or $FILE for file itself; special value $THISRESULT should be used to specify that result of merge saved by tool in $THIS file itself.)
• executable name for different platforms
• list of supported platforms (Linux/Windows/Mac)

• additionally for windows tools will be nice to have confirmation: does the tool present in registry under HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\tool.exe -- where tool.exe is executable name of the tool.

Some tools listed/explained here: http://open-tube.com/best-free-file-comparison-tools/

Tools

Beyond Compare 3

• Home page: http://www.scootersoftware.com

• Arguments: $THIS $OTHER $BASE $RESULT
• Executable: bcompare (Linux), BComp.exe (Windows)
• Supported platforms: Linux, Windows

• Present in registry: HKEY_CURRENT_USER\Software\Scooter Software\Beyond Compare 3\ExePath

DiffMerge

• Home page: http://www.sourcegear.com/diffmerge/

• Arguments: -result=$RESULT -t1=BASE -t2=THIS -t3=OTHER $BASE $THIS $OTHER

• Executable: DiffMerge.exe (Windows), diffmerge (Linux), ??? (Mac)

• Supported platforms: Linux, Windows, Mac OS X

• Present in registry: HKLM\Software\SourceGear\SourceGear DiffMerge\Location

Diffuse

An excellent open source diff and merge tool, written in python with syntax highlighting and support for multiple tabs (so you can have lots of diffs/merges open at the same time).

• Home page: http://diffuse.sourceforge.net

• Arguments: -m ? Not really sure
• Executable: diffusew.exe (Windows), diffuse (Linux)
• Supported platforms: Linux, Windows, Mac OS X
• Present in registry: Not obviously

KDiff3

• Home page: http://kdiff3.sourceforge.net/

  • Documentation: http://kdiff3.sourceforge.net/doc/documentation.html#commandline

• Arguments: $BASE $THIS $OTHER --output $RESULT
• Executable: kdiff3.exe (Windows), kdiff3 (others)
• Supported platforms: Linux, Windows, Mac OS X, Any Unix supported by Qt

P4Merge

• Home page: http://www.perforce.com/perforce/products/merge.html

• Arguments: [$BASE] $OTHER $THIS [$RESULT]
• Executable: p4merge.exe (Windows), p4merge (others)
• Supported platforms: Linux, Mac OSX, FreeBSD, Solaris, Windows
• Present in registry (install folder, not full exe link): HKLM\Software\Perforce\Environment\P4INSTROOT

WinMerge

• Home page: http://winmerge.org/

• Arguments: $RESULT
• Executable: WinMergeU.exe (Windows)
• Supported platforms: Windows only
• Present in registry (App Paths).