Mercurial > hg
view tests/test-double-merge.out @ 6486:960bc707ea10
doc: escape .hg at bol in manpages with make (issue1072)
This works around a bug in old docbook stylesheets.
Remove .*.swp example from hgignore.5.txt.
Diagnosis and workaround thanks to Alexis S. L. Carvalho.
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Mon, 07 Apr 2008 09:02:04 +0200 |
parents | 4b0c9c674707 |
children | 368a4ec603cc |
line wrap: on
line source
created new head 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