Mercurial > hg-stable
comparison tests/test-merge7.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 | bf6c91cb816f |
| children | 7544700fd931 |
comparison
equal
deleted
inserted
replaced
| 1921:acce3f7e1779 | 1922:6d50d6189269 |
|---|---|
| 22 test.txt versions differ, resolve | 22 test.txt versions differ, resolve |
| 23 merging test.txt | 23 merging test.txt |
| 24 resolving test.txt | 24 resolving test.txt |
| 25 file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557 | 25 file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557 |
| 26 merging test.txt failed! | 26 merging test.txt failed! |
| 27 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
| 28 (branch merge, don't forget to commit) | |
| 27 one | 29 one |
| 28 <<<<<<< | 30 <<<<<<< |
| 29 two-point-five | 31 two-point-five |
| 30 ======= | 32 ======= |
| 31 two-point-one | 33 two-point-one |