Mercurial > hg > easyhg

diff easyhg-merge.bat @ 379:d2e4bf428cfc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Try to make kdiff3 a bit clearer
author Chris Cannam
date Wed, 13 Apr 2011 17:09:57 +0100
parents 256138a4ed0e
children
line wrap: on
line diff
--- a/easyhg-merge.bat	Tue Apr 12 12:21:51 2011 +0100
+++ b/easyhg-merge.bat	Wed Apr 13 17:09:57 2011 +0100
@@ -18,5 +18,5 @@
 if "%found%"=="" (
     echo. "Failed to find kdiff.exe in path"
 ) else (
-    "%found%" "%~2" "%~1" "%~3" -o "%~1"
+    "%found%" "%~2" "%~1" "%~3" -o "%~1" --auto -L1 "%~1 (Common ancestor)" -L2 "%~1 (Your current version)" -L3 "%~1 (Version being merged)"
 )