Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-flags.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 |
comparison
equal
deleted
inserted
replaced
1921:acce3f7e1779 | 1922:6d50d6189269 |
---|---|
42 summary: added a b | 42 summary: added a b |
43 | 43 |
44 resolving manifests | 44 resolving manifests |
45 merging a | 45 merging a |
46 resolving a | 46 resolving a |
47 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
48 (branch merge, don't forget to commit) | |
47 -rwxr-x--- | 49 -rwxr-x--- |
48 -rwxr-x--- | 50 -rwxr-x--- |