Mercurial > hg
view tests/test-double-merge.out @ 6083:81a8667331e8
convert: detect baz before tla
The former seems to handle repositories built by the latter, the opposite is not true.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Tue, 12 Feb 2008 23:35:35 +0100 |
parents | 5af5f0f9d724 |
children | 4b0c9c674707 |
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 picked tool 'internal:merge' for foo (binary False symlink False) merging foo and bar my foo@2092631ce82b+ other bar@7731dad1c2b9 ancestor foo@310fd17130da premerge successful picked tool 'internal:merge' for foo (binary False symlink False) merging foo my foo@2092631ce82b+ other foo@7731dad1c2b9 ancestor foo@310fd17130da premerge successful 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