view tests/test-hup.out @ 5340:ad8783fe20f7

darcs2hg: Now detects and recovers from simple darcs conflicts.
author Terry Smith <terry@t11e.com>
date Tue, 11 Sep 2007 13:13:54 -0400
parents 73c918c71300
children 30d4d8985dd8
line wrap: on
line source

0
0
adding changesets
killed!
transaction abort!
rollback completed
.hg/00changelog.i .hg/journal.dirstate .hg/requires .hg/store .hg/store/00changelog.i .hg/store/00changelog.i.a