Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge7.out @ 4361:46280c004f22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change tests to use simplemerge by default
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 16 Apr 2007 20:17:39 -0300
parents b16456909a0a
children 93a4e72b4f83
comparison
equal deleted inserted replaced
4360:d5c3a70f8422 4361:46280c004f22
4 adding changesets 4 adding changesets
5 adding manifests 5 adding manifests
6 adding file changes 6 adding file changes
7 added 1 changesets with 1 changes to 1 files (+1 heads) 7 added 1 changesets with 1 changes to 1 files (+1 heads)
8 (run 'hg heads' to see heads, 'hg merge' to merge) 8 (run 'hg heads' to see heads, 'hg merge' to merge)
9 merge: warning: conflicts during merge 9 warning: conflicts during merge.
10 merging test.txt 10 merging test.txt
11 merging test.txt failed! 11 merging test.txt failed!
12 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 12 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
13 There are unresolved merges, you can redo the full merge using: 13 There are unresolved merges, you can redo the full merge using:
14 hg update -C 1 14 hg update -C 1
18 adding changesets 18 adding changesets
19 adding manifests 19 adding manifests
20 adding file changes 20 adding file changes
21 added 1 changesets with 1 changes to 1 files (+1 heads) 21 added 1 changesets with 1 changes to 1 files (+1 heads)
22 (run 'hg heads' to see heads, 'hg merge' to merge) 22 (run 'hg heads' to see heads, 'hg merge' to merge)
23 merge: warning: conflicts during merge 23 warning: conflicts during merge.
24 resolving manifests 24 resolving manifests
25 overwrite None partial False 25 overwrite None partial False
26 ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360 26 ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360
27 test.txt: versions differ -> m 27 test.txt: versions differ -> m
28 merging test.txt 28 merging test.txt