changeset 3580 | 41989e55fa37 |
parent 2830 | 49988d9f0758 |
child 3592 | fffc8a733bf9 |
--- a/tests/test-merge5.out +++ b/tests/test-merge5.out @@ -1,3 +1,4 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing b -abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes +abort: outstanding uncommited changes, use 'hg update -C' to lose changes +1 files updated, 0 files merged, 0 files removed, 0 files unresolved