Skip to content
Snippets Groups Projects
Commit b2ae81a7df29 authored by Thomas Arendsen Hein's avatar Thomas Arendsen Hein
Browse files

Make hg update more verbose by default (issue12)

(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.
parent 3044a3fdae76
No related branches found
No related tags found
No related merge requests found
Showing
with 92 additions and 11 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment