tests/test-hup.out
author Matt Mackall <mpm@selenic.com>
Thu, 12 Nov 2009 12:03:39 -0600
changeset 9843 d1043c2ffe6c
parent 5814 dd5a501cb97f
child 10881 a685011ed38e
permissions -rw-r--r--
merge: fix changectx.ancestor(workingctx) (issue1327)

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