##// 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.
Pierre-Yves David -
r17422:93bc65e9 stable
Show More
Name Size Modified Last Commit Author
/ contrib
hgfixes
hgsh
macosx
plan9
vim
win32
wix
bash_completion Loading ...
buildrpm Loading ...
casesmash.py Loading ...
check-code.py Loading ...
convert-repo Loading ...
debugcmdserver.py Loading ...
debugshell.py Loading ...
dumprevlog Loading ...
hg-ssh Loading ...
hgk Loading ...
hgweb.fcgi Loading ...
hgweb.wsgi Loading ...
logo-droplets.svg Loading ...
memory.py Loading ...
mercurial.el Loading ...
mercurial.spec Loading ...
mergetools.hgrc Loading ...
mq.el Loading ...
perf.py Loading ...
pylintrc Loading ...
python-hook-examples.py Loading ...
sample.hgrc Loading ...
setup3k.py Loading ...
shrink-revlog.py Loading ...
simplemerge Loading ...
tcsh_completion Loading ...
tcsh_completion_build.sh Loading ...
tmplrewrite.py Loading ...
undumprevlog Loading ...
xml.rnc Loading ...
zsh_completion Loading ...