Mercurial > hg > easyhg

comparison 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
comparison
equal deleted inserted replaced
378:ad2e56d1e4c4 379:d2e4bf428cfc
16 if not "%SEARCH%"=="" goto loop; 16 if not "%SEARCH%"=="" goto loop;
17 :done 17 :done
18 if "%found%"=="" ( 18 if "%found%"=="" (
19 echo. "Failed to find kdiff.exe in path" 19 echo. "Failed to find kdiff.exe in path"
20 ) else ( 20 ) else (
21 "%found%" "%~2" "%~1" "%~3" -o "%~1" 21 "%found%" "%~2" "%~1" "%~3" -o "%~1" --auto -L1 "%~1 (Common ancestor)" -L2 "%~1 (Your current version)" -L3 "%~1 (Version being merged)"
22 ) 22 )