view tests/test-hup.out @ 2827:56f99f5aab34

Merge: refactor err and failedmerge -> unresolved
author Matt Mackall <mpm@selenic.com>
date Tue, 08 Aug 2006 09:26:00 -0500
parents b72562060e45
children 8ae88ed2a3b6
line wrap: on
line source

0
0
adding changesets
killed!
transaction abort!
rollback completed
00changelog.i
data
journal.dirstate