tests/test-hup.out
author Brendan Cully <brendan@kublai.com>
Thu, 23 Aug 2007 22:45:41 -0700
changeset 5223 3786ef8877d5
parent 4970 30d4d8985dd8
permissions -rw-r--r--
imerge: add automerge flag to attempt to batch merge all conflicts

0
0
adding changesets
transaction abort!
rollback completed
killed!
.hg/00changelog.i .hg/journal.dirstate .hg/requires .hg/store .hg/store/00changelog.i .hg/store/00changelog.i.a