Mercurial > hg
comparison tests/test-merge7.out @ 2979:92a0c2200e41
merge: use context code to retrieve manifests
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 22 Aug 2006 19:32:16 -0500 |
parents | 49988d9f0758 |
children | 40e777bda455 |
comparison
equal
deleted
inserted
replaced
2978:962b9c7df641 | 2979:92a0c2200e41 |
---|---|
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 linear False |
26 ancestor 055d847dd401 local 2eded9ab0a5c remote 84cf5750dd20 | 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 |
31 merging test.txt failed! | 31 merging test.txt failed! |