tests/test-hup.out
author Matt Mackall <mpm@selenic.com>
Wed, 02 Nov 2005 20:22:29 -0800
changeset 1495 1e265c2bec94
parent 1261 fccc90f1994e
child 2223 b72562060e45
permissions -rw-r--r--
Deal with merge abort more gracefully We save parent info last rather than first.

0
0
adding changesets
killed!
transaction abort!
rollback completed
00changelog.d
00changelog.i
data
journal.dirstate