view tests/test-merge5.out @ 5359:645a40777fd4

test-convert-cvs: handle older cvs client
author Christian Ebert <blacktrash@gmx.net>
date Wed, 03 Oct 2007 21:01:47 +0200
parents fffc8a733bf9
children
line wrap: on
line source

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