Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge7.out @ 3111:40e777bda455

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remove linear variable
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 17:13:02 -0500
parents 92a0c2200e41
children 2ef0b3aae186
comparison
equal deleted inserted replaced
3110:62044d161470 3111:40e777bda455
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 merge: warning: conflicts during merge
24 resolving manifests 24 resolving manifests
25 overwrite None branchmerge True partial False linear False 25 overwrite None branchmerge True partial False
26 ancestor 451c744aabcc local a070d41e8360 remote faaea63e63a9 26 ancestor 451c744aabcc local a070d41e8360 remote faaea63e63a9
27 test.txt versions differ, resolve 27 test.txt versions differ, resolve
28 merging test.txt 28 merging test.txt
29 resolving test.txt 29 resolving test.txt
30 file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557 30 file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557