tests/test-hghave.t
author Durham Goode <durham@fb.com>
Thu, 08 May 2014 16:37:33 -0700
changeset 21273 20b8090d8125
parent 12430 60738066e37a
child 25472 4d2b9b304ad0
permissions -rw-r--r--
merge: define conflict marker labels in filemerge() Moves the conflict marker definition up to filemerge, so it gets applied to all merge strategies, and so in a future patch we can manipulate the markers.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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