sapling/tests/test-merge5.out
2006-08-09 13:55:18 -05:00

4 lines
159 B
Plaintext

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