test-merge-revert2.out
26 lines
| 425 B
| text/plain
|
TextLexer
/ tests / test-merge-revert2.out
|
r925 | 1:f4d7a8c73d23 | ||
0:232e179b3f29 | ||||
|
r864 | f4d7a8c73d23 tip | ||
232e179b3f29 | ||||
232e179b3f29+ | ||||
232e179b3f29 | ||||
f4d7a8c73d23 tip | ||||
|
r792 | merge: warning: conflicts during merge | ||
merging file1 | ||||
merging file1 failed! | ||||
|
r864 | diff -r f4d7a8c73d23 file1 | ||
|
r792 | --- a/file1 | ||
+++ b/file1 | ||||
|
r864 | @@ -1,3 +1,7 @@ | ||
|
r792 | added file1 | ||
|
r864 | another line of text | ||
|
r792 | +<<<<<<< | ||
+changed file1 different | ||||
+======= | ||||
changed file1 | ||||
+>>>>>>> | ||||
M file1 | ||||
|
r864 | f4d7a8c73d23+ tip | ||
f4d7a8c73d23 tip | ||||
f4d7a8c73d23 tip | ||||
f4d7a8c73d23 tip | ||||