tests/test-hup.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 03 Jul 2006 19:28:31 +0200
changeset 2552 bb403d427974
parent 2223 b72562060e45
child 3713 8ae88ed2a3b6
permissions -rw-r--r--
Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec)

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