##// END OF EJS Templates
mergetools.hgrc: set vimdiff to check=changed...
mergetools.hgrc: set vimdiff to check=changed The standard reaction in from of unexpected vimdiff is to ":quit". This will make vimdiff return a 0 status even if no merge were done at all. This change detect that nothing have been changed in vimdiff as a potential unresolved conflict.

File last commit:

r13041:79388a83 stable
r17422:93bc65e9 stable
Show More
hg.cmd
3 lines | 68 B | application/x-dos-batch | BatchLexer
@echo off
rem launch hg.exe from parent folder
"%~dp0\..\hg.exe" %*