changeset 3002 | a31557193f3c |
parent 2175 | b2ae81a7df29 |
child 3317 | 966632304dde |
child 3328 | 49966b5ab16f |
--- a/tests/test-merge1.out +++ b/tests/test-merge1.out @@ -1,6 +1,8 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved %% no merges expected -1 files updated, 0 files merged, 0 files removed, 0 files unresolved +merging for b +merging b +0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved %% merge should fail