view tests/test-hup.out @ 3240:8d4855fd9d7b

merge: use new working context object in update
author Matt Mackall <mpm@selenic.com>
date Tue, 03 Oct 2006 01:21:46 -0500
parents b72562060e45
children 8ae88ed2a3b6
line wrap: on
line source

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