Mercurial > hg

view tests/test-double-merge.out @ 5294:e14118f92730

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: fix regression in 6fd953d5faea It caused qrefresh; qrefresh -X addedfile to leave the file as normal in dirstate. It should be marked added on the second pass.
author Brendan Cully <brendan@kublai.com>
date Mon, 10 Sep 2007 15:00:05 -0700
parents f191bc3916f7
children 17ed9b9a0d03
line wrap: on
line source

resolving manifests
 overwrite None partial False
 ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9
 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