tests/test-merge5.out
author Patrick Mezard <pmezard@gmail.com>
Thu, 09 Aug 2007 23:14:50 +0200
changeset 5134 9b5ae133bd5a
parent 3592 fffc8a733bf9
permissions -rw-r--r--
test-no-symlinks: rename .bundle into .hg for consistency.

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