view tests/test-hup.out @ 1495:1e265c2bec94

Deal with merge abort more gracefully We save parent info last rather than first.
author Matt Mackall <mpm@selenic.com>
date Wed, 02 Nov 2005 20:22:29 -0800
parents fccc90f1994e
children b72562060e45
line wrap: on
line source

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