Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge7.out @ 2956:6dddcba7596a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 18 Aug 2006 21:17:28 -0700
parents 49988d9f0758
children 92a0c2200e41
comparison
equal deleted inserted replaced
2955:9d1c3529ebbc 2956:6dddcba7596a
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 force False allow True moddirstate True linear False 25 overwrite None branchmerge True partial False linear False
26 ancestor 055d847dd401 local 2eded9ab0a5c remote 84cf5750dd20 26 ancestor 055d847dd401 local 2eded9ab0a5c remote 84cf5750dd20
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