Mercurial > hg > gitweb
view tests/test-grep.out @ 2175:b2ae81a7df29
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.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 02 May 2006 18:44:02 +0200 |
parents | fad2d091c74f |
children | 81f351c5264d |
line wrap: on
line source
port:4:export port:4:vaportight port:4:import/export FIXME: history is wrong here port:1:1:-:eggs:import port:1:2:+:eggs:vaportight port:1:3:+:eggs:import/export port:0:2:+:spam:export port:0:1:+:spam:import port:4:import/export