equal
deleted
inserted
replaced
54 --- a/file1 |
54 --- a/file1 |
55 +++ b/file1 |
55 +++ b/file1 |
56 @@ -1,3 +1,7 @@ |
56 @@ -1,3 +1,7 @@ |
57 added file1 |
57 added file1 |
58 another line of text |
58 another line of text |
59 +<<<<<<< working copy: c3fa057dd86f - test: added file1 and file2 |
59 +<<<<<<< working copy: c3fa057dd86f - test: added file1 and file2 |
60 +changed file1 different |
60 +changed file1 different |
61 +======= |
61 +======= |
62 changed file1 |
62 changed file1 |
63 +>>>>>>> destination: dfab7f3c2efb - test: changed file1 |
63 +>>>>>>> destination: dfab7f3c2efb - test: changed file1 |
64 |
64 |