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.
6 lines
160 B
Plaintext
6 lines
160 B
Plaintext
adding a
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
adding b
|
|
pushing to ../a
|
|
abort: could not lock repository ../a: Permission denied
|