equal
deleted
inserted
replaced
21 --- a/file1 |
21 --- a/file1 |
22 +++ b/file1 |
22 +++ b/file1 |
23 @@ -1,3 +1,7 @@ added file1 |
23 @@ -1,3 +1,7 @@ added file1 |
24 added file1 |
24 added file1 |
25 another line of text |
25 another line of text |
26 +<<<<<<< |
26 +<<<<<<< my |
27 +changed file1 different |
27 +changed file1 different |
28 +======= |
28 +======= |
29 changed file1 |
29 changed file1 |
30 +>>>>>>> |
30 +>>>>>>> other |
31 M file1 |
31 M file1 |
32 f248da0d4c3e+ tip |
32 f248da0d4c3e+ tip |
33 reverting file1 |
33 reverting file1 |
34 f248da0d4c3e tip |
34 f248da0d4c3e tip |
35 f248da0d4c3e tip |
35 f248da0d4c3e tip |