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.
9 lines
314 B
Plaintext
9 lines
314 B
Plaintext
adding file
|
|
% create a second head
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
created new head
|
|
% failing merge
|
|
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
|
|
% resolve -l, should be empty
|