Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-hup.out @ 5344:cc34be74eeec
Merge with crew-stable.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Sat, 29 Sep 2007 21:10:54 -0700 |
parents | 30d4d8985dd8 |
children |
comparison
equal
deleted
inserted
replaced
5343:26692d08c2f9 | 5344:cc34be74eeec |
---|---|
1 0 | 1 0 |
2 0 | 2 0 |
3 adding changesets | 3 adding changesets |
4 killed! | |
5 transaction abort! | 4 transaction abort! |
6 rollback completed | 5 rollback completed |
6 killed! | |
7 .hg/00changelog.i .hg/journal.dirstate .hg/requires .hg/store .hg/store/00changelog.i .hg/store/00changelog.i.a | 7 .hg/00changelog.i .hg/journal.dirstate .hg/requires .hg/store .hg/store/00changelog.i .hg/store/00changelog.i.a |