annotate tests/test-hghave.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 60738066e37a
children 4d2b9b304ad0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12430
60738066e37a tests: unify test-hghave
Matt Mackall <mpm@selenic.com>
parents: 8059
diff changeset
1 Testing that hghave does not crash when checking features
8059
41a2c5cbcb6a hghave: checking that all targets are Exception-free
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
2
12430
60738066e37a tests: unify test-hghave
Matt Mackall <mpm@selenic.com>
parents: 8059
diff changeset
3 $ "$TESTDIR/hghave" --test-features 2>/dev/null