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.
15 lines
480 B
Plaintext
15 lines
480 B
Plaintext
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
created new head
|
|
|
|
% Merging a conflict araises
|
|
merging A
|
|
warning: conflicts during merge.
|
|
merging A failed!
|
|
1 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
|
|
|
|
% Correct the conflict without marking the file as resolved
|
|
abort: unresolved merge conflicts (see hg resolve)
|
|
|
|
% Mark the conflict as resolved and commit
|