tests/test-merge5.out
author Patrick Mezard <pmezard@gmail.com>
Fri, 05 Oct 2007 23:01:38 +0200
changeset 5391 786c1206a029
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Test *_ISLINK merge environment vars

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