test-merge-revert2.out
37 lines
| 925 B
| text/plain
|
TextLexer
/ tests / test-merge-revert2.out
|
r1933 | 1:f248da0d4c3e | ||
0:9eca13a34789 | ||||
f248da0d4c3e tip | ||||
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r1933 | 9eca13a34789 | ||
9eca13a34789+ | ||||
|
r2029 | reverting file1 | ||
|
r1933 | 9eca13a34789 | ||
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r1933 | f248da0d4c3e tip | ||
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r4365 | warning: conflicts during merge. | ||
|
r792 | merging file1 | ||
merging file1 failed! | ||||
|
r2175 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||
There are unresolved merges with locally modified files. | ||||
|
r3869 | You can redo the full merge using: | ||
hg update 0 | ||||
hg update 1 | ||||
|
r1933 | diff -r f248da0d4c3e file1 | ||
|
r792 | --- a/file1 | ||
+++ b/file1 | ||||
|
r5863 | @@ -1,3 +1,7 @@ | ||
|
r792 | added file1 | ||
|
r864 | another line of text | ||
|
r4387 | +<<<<<<< my | ||
|
r792 | +changed file1 different | ||
+======= | ||||
changed file1 | ||||
|
r4387 | +>>>>>>> other | ||
|
r792 | M file1 | ||
|
r1933 | f248da0d4c3e+ tip | ||
|
r2029 | reverting file1 | ||
|
r1933 | f248da0d4c3e tip | ||
f248da0d4c3e tip | ||||
|
r2175 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r1933 | f248da0d4c3e tip | ||