##// 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:

r16489:cf137319 stable
r17422:93bc65e9 stable
Show More
proto
24 lines | 478 B | text/plain | ProtoBufLexer
lib - sys sys
mercurial - sys sys
hgrc.d - sys sys
9diff.rc - sys sys
factotum.rc - sys sys
rc - sys sys
bin - sys sys
9diff - sys sys
hg - sys sys
sys - sys sys
lib - sys sys
python - sys sys
lib - sys sys
python2.5 - sys sys
site-packages - sys sys
hgext - sys sys
+ - sys sys
mercurial - sys sys
+ - sys sys
mercurial-VERSION-py2.5.egg-info - sys sys
src - sys sys
cmd - sys sys
hg - sys sys
+ - sys sys