mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +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.
16 lines
386 B
Plaintext
16 lines
386 B
Plaintext
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
warning: conflicts during merge.
|
|
merging a
|
|
merging a failed!
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
There are unresolved merges, you can redo the full merge using:
|
|
hg update -C 2
|
|
hg merge 1
|
|
e7fe8eb3e180+0d24b7662d3e+ tip
|
|
<<<<<<< my
|
|
something else
|
|
=======
|
|
something
|
|
>>>>>>> other
|
|
M a
|