changeset 21693 | 9c35f3a8cac4 |
parent 21519 | 25d5a9ecbb85 |
child 21947 | b081decd9062 |
--- a/tests/test-merge7.t Thu Aug 15 15:47:15 2013 -0500 +++ b/tests/test-merge7.t Mon May 26 11:44:58 2014 -0700 @@ -98,11 +98,11 @@ $ cat test.txt one - <<<<<<< local: 50c3a7e29886 - test: "Merge 1" + <<<<<<< local: 50c3a7e29886 - test: Merge 1 two-point-five ======= two-point-one - >>>>>>> other: 40d11a4173a8 - test: "two -> two-point-one" + >>>>>>> other: 40d11a4173a8 - test: two -> two-point-one three $ hg debugindex test.txt