tests/test-hup.out
author Matt Mackall <mpm@selenic.com>
Tue, 08 May 2007 02:59:13 -0500
changeset 4416 bb1800a7d7e1
parent 3917 a413f5c29c46
child 4275 73c918c71300
permissions -rw-r--r--
merge: fix spurious merges for copies in linear updates We make better use of contexts to accurately identify copies that don't need merges. Add a simple test and update other tests.

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