Mercurial > hg
view tests/test-hup.out @ 3400:d2b55e3c4e25
merge: if filemerge skips merge, report as updated
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 15 Oct 2006 16:18:09 -0500 |
parents | b72562060e45 |
children | 8ae88ed2a3b6 |
line wrap: on
line source
0 0 adding changesets killed! transaction abort! rollback completed 00changelog.i data journal.dirstate