equal
deleted
inserted
replaced
4 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
4 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
5 fast-forward |
5 fast-forward |
6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7 (branch merge, don't forget to commit) |
7 (branch merge, don't forget to commit) |
8 bogus fast-forward should fail |
8 bogus fast-forward should fail |
9 abort: there is nothing to merge, just use 'hg update' or look at 'hg heads' |
9 abort: can't merge with ancestor |
10 done |
10 done |