changeset 21519 | 25d5a9ecbb85 |
parent 15501 | 2371f4aea665 |
child 21537 | 1ab30e9ba0fc |
--- a/tests/test-merge-revert2.t Tue Apr 22 12:20:10 2014 -0700 +++ b/tests/test-merge-revert2.t Thu May 08 16:50:22 2014 -0700 @@ -57,11 +57,11 @@ @@ -1,3 +1,7 @@ added file1 another line of text - +<<<<<<< local + +<<<<<<< local: c3fa057dd86f - test: "added file1 and file2" +changed file1 different +======= changed file1 - +>>>>>>> other + +>>>>>>> other: dfab7f3c2efb - test: "changed file1" $ hg status M file1