Mercurial Diff Merge Integration

Mercurial can be configured to use Guiffy as its diff and merge tool.

Mercurial Diff Tool Integration

To use Guiffy for diff operations, add the following to your .hgrc file:

[extensions]
hgext.extdiff =

[extdiff]
cmd.guidiff = C:\Program Files\guiffy114\guiffy.exe

Mercurial Merge Tool Integration

To use Guiffy for merge operations, add the following to your .hgrc file:

[merge-tools]
guiffy.executable = C:\Program Files\guiffy114\guiffy.exe
guiffy.args = -s $local $other $base $output
guiffy.gui = True
guiffy.check = changed
guiffy.priority = 1

NOTE: The above executable path variables are for Guiffy on Windows.
To use Guiffy for diff operations on MacOS X, the cmd variable would be:

cmd.guidiff = /Applications/guiffy114/guiffyCL.command
To use Guiffy for merge operations on MacOS X, the executable variable would be:

guiffy.executable = /Applications/guiffy114/guiffyCL.command


To use Guiffy for diff operations on Linux or Unix, the cmd variable would be something like:

cmd.guidiff = sh /home/billri/guiffy114/guiffy
To use Guiffy for merge operations on Linux or Unix, the executable variable would be something like:

guiffy.executable = sh /home/billri/guiffy114/guiffy


Documentation by Guiffy Software, Inc. 2016