mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
46d0753ec7
(including small changes to revert and backout to not show these stats with the exception of backout --merge) Show update stats (unless -q), e.g.: K files updated, L files merged, M files removed, N files unresolved Inform the user what to do after a merge: (branch merge, don't forget to commit) Inform the user what to do if a branch merge failed: There are unresolved merges, you can redo the full merge using: hg update -C X hg merge Y Inform the user what to do if a working directory merge failed: There are unresolved merges with locally modified files.
14 lines
367 B
Plaintext
14 lines
367 B
Plaintext
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
merge: 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
|
|
something else
|
|
=======
|
|
something
|
|
M a
|