this is no longer needed because DiffMerge now returns correct status codes indicating whether a merge was successful or failed. On the web one can find recommendations to set trustExitCode = false You have to use git mergetool -t diffmerge Git does not merge automatically but will rather leave merge markes in the file. Git (~/.git):Ĭmd = diffmerge -merge -result=$MERGED $LOCAL $BASE $REMOTE That’s why TortoiseHg also needs to be configured explicitly to use DiffMerge as visual diff tool. Since the built-in diff command will always print directly to console (you can pipe this into a patch file too, very useful!) you need the extdiff extension to enable diffing with DiffMerge. Mercurial will fire up DiffMerge during merges automatically from now on. Mercurial (~/Mercurial.ini):Ĭmd.diffmerge = c:\Programme\SourceGear\DiffMerge\DiffMerge.exeĭiffmerge.executable = c:\Programme\SourceGear\DiffMerge\DiffMerge.exeĭiffmerge.args = -result=$output -t1="Local Version" -t2=$output -t3="Other Version" -caption=$output $local $base $other Configuration is the same for Windows/Mac OS X and Unix, however you’ll have to adapt the path to the DiffMerge executable accordingly. The configuration files are alway located in the user’s home directory. Integrating DiffMerge with the various VCS I use (mercurial, git and svn) is quite cumbersome, but is fortunately very well possible. Remembering only the workings of one diff tool significantly reduces friction for me. The feature set (and the UI!) is same on all platforms. WinMerge can be used as an external differencing/merging tool or as a standalone application. The reason it is my tool du jour is its perfect cross-platform implementation supporting Windows, MacOS X and Unix. Besides normal diff and also folder diffs, it supports three-way merging and has a pretty sweet, intuitive UI with a-well chosen colour scheme and excellent shortcuts. My preferred merge/diff tool at the moment is DiffMerge by SourceGear.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |