tests/test-merge5.out
author Patrick Mezard <pmezard@gmail.com>
Sun, 30 Sep 2007 12:08:33 +0200
changeset 5346 9f35d0bcf00e
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Test mercurial convert sink removes empty directories.

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