tests/test-merge5.out
author Patrick Mezard <pmezard@gmail.com>
Sat, 06 Oct 2007 22:30:22 +0200
changeset 5405 8feb33c2d153
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Display symlink or executable bit with manifest -v New output looks like: 644 a 755 * b/a 644 @ l

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