Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-update-reverse.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 | 3a0b69ea5708 |
children | 7544700fd931 |
comparison
equal
deleted
inserted
replaced
1921:acce3f7e1779 | 1922:6d50d6189269 |
---|---|
45 remote deleted side1, clobbering | 45 remote deleted side1, clobbering |
46 remote created main | 46 remote created main |
47 getting main | 47 getting main |
48 removing side1 | 48 removing side1 |
49 removing side2 | 49 removing side2 |
50 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
50 Should only show a main | 51 Should only show a main |
51 a | 52 a |
52 main | 53 main |