mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
928c430865
Includes the change to the message itself, along with several test output files that also had to change.
16 lines
399 B
Plaintext
16 lines
399 B
Plaintext
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
created new head
|
|
merging a
|
|
warning: conflicts during merge.
|
|
merging a failed!
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
|
|
e7fe8eb3e180+0d24b7662d3e+ tip
|
|
<<<<<<< local
|
|
something else
|
|
=======
|
|
something
|
|
>>>>>>> other
|
|
M a
|
|
? a.orig
|