Mercurial > hg-stable

view tests/test-merge5.out @ 5750:206b44764340

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-convert-cvs: force cvs -f options to avoid cvsrc There are some reference to a CVS_OPTIONS environment variable doing that but it does not work on my system (cvs 1.11.20, macosx).
author Patrick Mezard <pmezard@gmail.com>
date Thu, 27 Dec 2007 19:23:22 +0100
parents fffc8a733bf9
children 4b0c9c674707
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