Описание тега diffmerge

DiffMerge is an free 3-way merge tool by SourceGear that runs on Windows, Mac, and Linux.

With the 3.3.0 release (April 2009), DiffMerge is compatible with Mercurial external merge feature. When the --result=file argument is used, DiffMerge writes the merge result to the given file and exits with 0 (merge resolved), 1 (merge aborted), or 2 (other error). Note that DiffMerge does not handle binary files so you'll want to configure another tool for them.

You can also use DiffMerge as an external diff viewer using the extdiff extension feature. With the changes below, you can type hg diffmerge instead of hg diff.