view tests/test-hup.out @ 4259:bda63383d529

Make import opportunistically use merge information
author Brendan Cully <brendan@kublai.com>
date Wed, 21 Mar 2007 14:06:25 -0700
parents a413f5c29c46
children 73c918c71300
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