view tests/test-hup.out @ 1349:c6295d2a361e

More info on file merge for update --debug
author Matt Mackall <mpm@selenic.com>
date Mon, 26 Sep 2005 14:01:05 -0700
parents fccc90f1994e
children b72562060e45
line wrap: on
line source

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