tests/test-hup.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Mon, 16 Apr 2007 20:17:39 -0300
changeset 4361 46280c004f22
parent 4275 73c918c71300
child 4970 30d4d8985dd8
permissions -rw-r--r--
change tests to use simplemerge by default

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