view tests/test-hup.out @ 3096:54d85098fb82

merge: make unresolved a counter
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 19:39:54 -0500
parents b72562060e45
children 8ae88ed2a3b6
line wrap: on
line source

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