changeset 4823 | 61343b40a141 |
parent 4815 | 8808ea7da86b |
4814:4cdbaa885d8a | 4823:61343b40a141 |
---|---|
1 adding a |
|
2 marked working directory as branch b |
|
3 adding b |
|
4 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
5 fast-forward |
|
6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
7 (branch merge, don't forget to commit) |
|
8 bogus fast-forward should fail |
|
9 abort: there is nothing to merge, just use 'hg update' or look at 'hg heads' |
|
10 done |