changeset 30460 | ce3a133f71b3 |
parent 26614 | ef1eb6df7071 |
child 49621 | 55c6ebd11cb9 |
--- a/tests/test-merge-revert2.t Thu Nov 10 09:21:41 2016 -0800 +++ b/tests/test-merge-revert2.t Sat Nov 19 15:41:37 2016 -0800 @@ -56,7 +56,7 @@ @@ -1,3 +1,7 @@ added file1 another line of text - +<<<<<<< working copy: c3fa057dd86f - test: added file1 and file2 + +<<<<<<< working copy: c3fa057dd86f - test: added file1 and file2 +changed file1 different +======= changed file1