tests/test-merge5.out
author Steve Borho <steve@ageia.com>
Tue, 02 Oct 2007 20:22:33 +0200
changeset 5350 1df76921aab3
parent 3592 fffc8a733bf9
permissions -rw-r--r--
set_exec: do not chmod a symlink

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