Mercurial > hg-stable
view tests/test-double-merge.out @ 5750:206b44764340
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 | 17ed9b9a0d03 |
children | 5af5f0f9d724 |
line wrap: on
line source
resolving manifests overwrite None partial False ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9 searching for copies back to rev 1 unmatched files in other: bar all copies found (* = to merge, ! = divergent): bar -> foo * checking for directory renames foo: versions differ -> m foo: remote copied to bar -> m copying foo to bar merging foo and bar my foo@2092631ce82b+ other bar@7731dad1c2b9 ancestor foo@310fd17130da merging foo my foo@2092631ce82b+ other foo@7731dad1c2b9 ancestor foo@310fd17130da 0 files updated, 2 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -- foo -- line 0 line 1 line 2-1 -- bar -- line 0 line 1 line 2-2