Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-hup.out @ 3620:3109f012c305
Clarify untracked file merge message
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 01 Nov 2006 21:47:55 -0600 |
parents | b72562060e45 |
children | 8ae88ed2a3b6 |
line wrap: on
line source
0 0 adding changesets killed! transaction abort! rollback completed 00changelog.i data journal.dirstate