equal
deleted
inserted
replaced
55 --- a/file1 |
55 --- a/file1 |
56 +++ b/file1 |
56 +++ b/file1 |
57 @@ -1,3 +1,7 @@ |
57 @@ -1,3 +1,7 @@ |
58 added file1 |
58 added file1 |
59 another line of text |
59 another line of text |
60 +<<<<<<< local: c3fa057dd86f - test: "added file1 and file2" |
60 +<<<<<<< working copy: c3fa057dd86f - test: "added file1 and file2" |
61 +changed file1 different |
61 +changed file1 different |
62 +======= |
62 +======= |
63 changed file1 |
63 changed file1 |
64 +>>>>>>> other: dfab7f3c2efb - test: "changed file1" |
64 +>>>>>>> destination: dfab7f3c2efb - test: "changed file1" |
65 |
65 |
66 $ hg status |
66 $ hg status |
67 M file1 |
67 M file1 |
68 ? file1.orig |
68 ? file1.orig |
69 $ hg id |
69 $ hg id |