tests/test-merge5.out
author Bryan O'Sullivan <bos@serpentine.com>
Sat, 29 Sep 2007 21:08:14 -0700
changeset 5343 26692d08c2f9
parent 3592 fffc8a733bf9
permissions -rw-r--r--
convert: delete empty directories if deleting a file (bug 754)

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