Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-hup.out @ 3233:3fd098e0902d
merge: extend file merge function for renames
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 02 Oct 2006 12:04:48 -0500 |
parents | b72562060e45 |
children | 8ae88ed2a3b6 |
line wrap: on
line source
0 0 adding changesets killed! transaction abort! rollback completed 00changelog.i data journal.dirstate