sapling/tests/test-merge5.out

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
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. 2006-05-02 20:44:02 +04:00			`1 files updated, 0 files merged, 0 files removed, 0 files unresolved`
Update tests to match new addremove chattiness. 2005-07-23 07:46:02 +04:00			`removing b`
Merge with crew, fix most tests 2006-08-09 22:55:18 +04:00			`abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes`