mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 15:57:43 +03:00
9 lines
315 B
Plaintext
9 lines
315 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 up --clean' to abandon
|
|
% resolve -l, should be empty
|