Mercurial > hg
diff tests/test-command-template.t @ 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 | 39c01f8e7b39 |
| children | 4f8054d3171b |