Mercurial > public > mercurial-scm > hg
diff tests/test-filebranch.out @ 1922:6d50d6189269
ui: output the number of file updated/merged/removed/... on update
add a note for people to remember commiting after a merge.
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Mon, 13 Mar 2006 08:56:59 +0100 |
| parents | 9344f5dd4488 |
| children | 7544700fd931 |
line wrap: on
line diff
--- a/tests/test-filebranch.out Sun Mar 12 20:34:09 2006 +0100 +++ b/tests/test-filebranch.out Mon Mar 13 08:56:59 2006 +0100 @@ -19,6 +19,8 @@ getting bar merging foo resolving foo +1 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) we shouldn't have anything but foo in merge state here m 644 3 foo main: we should have a merge here