tests/test-hup.out
author Matt Mackall <mpm@selenic.com>
Fri, 06 Oct 2006 16:55:11 -0500
changeset 3280 ae85272b59a4
parent 2223 b72562060e45
child 3713 8ae88ed2a3b6
permissions -rw-r--r--
merge: copy fixes and tests Fix up "already seen" logic Fix merge action in remote copy case Add status message Add lots of merge+copy/move test cases

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