Mercurial > hg
view doc/common.txt @ 17422:93bc65e970c0 stable
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.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Thu, 02 Aug 2012 13:51:49 +0200 |
parents | 2399362b3bb0 |
children |
line wrap: on
line source
.. Common link and substitution definitions. .. |hg(1)| replace:: **hg**\ (1) .. _hg(1): hg.1.html .. |hgrc(5)| replace:: **hgrc**\ (5) .. _hgrc(5): hgrc.5.html .. |hgignore(5)| replace:: **hgignore**\ (5) .. _hgignore(5): hgignore.5.html