equal
deleted
inserted
replaced
11 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
11 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12 (branch merge, don't forget to commit) |
12 (branch merge, don't forget to commit) |
13 % should succeed - 2 heads |
13 % should succeed - 2 heads |
14 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
14 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15 (branch merge, don't forget to commit) |
15 (branch merge, don't forget to commit) |
|
16 % should fail because at tip |
|
17 abort: there is nothing to merge |
|
18 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
16 % should fail because 1 head |
19 % should fail because 1 head |
17 abort: there is nothing to merge - use "hg update" instead |
20 abort: there is nothing to merge - use "hg update" instead |