changeset 21693 | 9c35f3a8cac4 |
parent 21519 | 25d5a9ecbb85 |
child 21864 | 755bf1bbe0a9 |
--- a/tests/test-conflict.t Thu Aug 15 15:47:15 2013 -0500 +++ b/tests/test-conflict.t Mon May 26 11:44:58 2014 -0700 @@ -22,11 +22,11 @@ 32e80765d7fe+75234512624c+ tip $ cat a - <<<<<<< local: 32e80765d7fe - test: "branch2" + <<<<<<< local: 32e80765d7fe - test: branch2 something else ======= something - >>>>>>> other: 75234512624c - test: "branch1" + >>>>>>> other: 75234512624c - test: branch1 $ hg status M a