![]() The python script below fixes both of these problems. It also merges to one of the Mercurial temporary files instead of the local file. It always returns 0 as its exit code, which causes Mercurial to assume that the merge was successful. Prior to the 3.3.0 release, DiffMerge was not directly compatible with Mercurial. On Mac OS X, please also install the command-line shell script that was included on the DMG see the README for details. On Windows, the executable should be: c:\Program Files\SourceGear\DiffMerge\DiffMerge.exe. hgrc or Mercurial.ini file:Äiffmerge.executable = /usr/bin/diffmergeÄiffmerge.args = -merge -result=$output -t1="Local Version" -t2=$output -t3="Other Version" -caption=$output $local $base $other To enable both diffing and merging with DiffMerge, add the following to your. With the changes below, you can type hg diffmerge instead of hg diff. You can also use DiffMerge as an external diff viewer using the extdiff extension feature. Note that DiffMerge does not handle binary files so you'll want to configure another tool for them. 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). With the 3.3.0 release (April 2009), DiffMerge is compatible with Mercurial external merge feature. ![]() DiffMerge is an free 3-way merge tool by SourceGear that runs on Windows, Mac, and Linux.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |