tests/test-hup.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 14 Dec 2005 22:19:03 -0600
changeset 1581 db10b7114de0
parent 1261 fccc90f1994e
child 2223 b72562060e45
permissions -rw-r--r--
abort when merging two heads and repository has local changes

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