mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 08:47:12 +03:00
274bce0c1c
This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.
38 lines
937 B
Plaintext
38 lines
937 B
Plaintext
1:f248da0d4c3e
|
|
0:9eca13a34789
|
|
f248da0d4c3e tip
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
9eca13a34789
|
|
9eca13a34789+
|
|
reverting file1
|
|
9eca13a34789
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
f248da0d4c3e tip
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
warning: conflicts during merge.
|
|
merging file1
|
|
merging file1 failed!
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
There are unresolved merges with locally modified files.
|
|
You can redo the full merge using:
|
|
hg update 0
|
|
hg update 1
|
|
diff -r f248da0d4c3e file1
|
|
--- a/file1
|
|
+++ b/file1
|
|
@@ -1,3 +1,7 @@ added file1
|
|
added file1
|
|
another line of text
|
|
+<<<<<<< my
|
|
+changed file1 different
|
|
+=======
|
|
changed file1
|
|
+>>>>>>> other
|
|
M file1
|
|
f248da0d4c3e+ tip
|
|
reverting file1
|
|
f248da0d4c3e tip
|
|
f248da0d4c3e tip
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
f248da0d4c3e tip
|