test-merge-revert2.out
28 lines
| 469 B
| text/plain
|
TextLexer
/ tests / test-merge-revert2.out
|
r1933 | 1:f248da0d4c3e | ||
0:9eca13a34789 | ||||
f248da0d4c3e tip | ||||
9eca13a34789 | ||||
9eca13a34789+ | ||||
|
r2029 | reverting file1 | ||
|
r1933 | 9eca13a34789 | ||
f248da0d4c3e tip | ||||
|
r792 | merge: warning: conflicts during merge | ||
merging file1 | ||||
merging file1 failed! | ||||
|
r1933 | diff -r f248da0d4c3e file1 | ||
|
r792 | --- a/file1 | ||
+++ b/file1 | ||||
|
r1637 | @@ -1,3 +1,7 @@ added file1 | ||
|
r792 | added file1 | ||
|
r864 | another line of text | ||
|
r792 | +<<<<<<< | ||
+changed file1 different | ||||
+======= | ||||
changed file1 | ||||
+>>>>>>> | ||||
M file1 | ||||
|
r1933 | f248da0d4c3e+ tip | ||
|
r2029 | reverting file1 | ||
|
r1933 | f248da0d4c3e tip | ||
f248da0d4c3e tip | ||||
f248da0d4c3e tip | ||||