view tests/test-hup.out @ 1674:dee55c4a4963

abort when using 'update -m' and this is not a merge add more testcases for updating with local changes
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 01 Feb 2006 08:46:24 +0100
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