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

r15782:7de76300 default
r17422:93bc65e9 stable
Show More
COPYING.rtf
0 lines | 1.6 KiB | application/rtf | TextLexer
/ contrib / wix / COPYING.rtf
Binary file (application/rtf)