Mercurial > hg
view tests/test-hup.out @ 8744:6b675c781c6d
merge: simplify 'other deleted' case
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 08 Jun 2009 18:14:44 -0500 |
parents | dd5a501cb97f |
children | a685011ed38e |
line wrap: on
line source
0 0 adding changesets transaction abort! rollback completed killed! .hg/00changelog.i .hg/journal.branch .hg/journal.dirstate .hg/requires .hg/store .hg/store/00changelog.i .hg/store/00changelog.i.a