tests/test-merge5.out
author Christian Ebert <blacktrash@gmx.net>
Wed, 03 Oct 2007 21:01:47 +0200
changeset 5359 645a40777fd4
parent 3592 fffc8a733bf9
permissions -rw-r--r--
test-convert-cvs: handle older cvs client

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes