Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-hup.out @ 5335:88e931f74e8b
convert_git: avoid returning two entries for the same file in getchanges
This could happen in merge changesets if the merged file was different
from both parents.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 24 Sep 2007 19:00:11 -0300 |
parents | 73c918c71300 |
children | 30d4d8985dd8 |
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 .hg/store/00changelog.i.a