changeset 21519 | 25d5a9ecbb85 |
parent 19264 | eac114e13b96 |
child 21552 | 61151f429a5f |
--- a/tests/test-merge-tools.t Tue Apr 22 12:20:10 2014 -0700 +++ b/tests/test-merge-tools.t Thu May 08 16:50:22 2014 -0700 @@ -66,11 +66,11 @@ [1] $ aftermerge # cat f - <<<<<<< local + <<<<<<< local: ef83787e2614 - test: "revision 1" revision 1 ======= revision 2 - >>>>>>> other + >>>>>>> other: 0185f4e0cf02 - test: "revision 2" space # hg stat M f