Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge7.out @ 3233:3fd098e0902d
merge: extend file merge function for renames
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 02 Oct 2006 12:04:48 -0500 |
parents | 2ef0b3aae186 |
children | e7abcf3a7c5f |
comparison
equal
deleted
inserted
replaced
3210:7240f9e47144 | 3233:3fd098e0902d |
---|---|
25 overwrite None branchmerge True partial 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 -> m | 27 test.txt: versions differ -> m |
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 my test.txt@451c744aabcc other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9 |
31 merging test.txt failed! | 31 merging test.txt failed! |
32 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 32 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
33 There are unresolved merges, you can redo the full merge using: | 33 There are unresolved merges, you can redo the full merge using: |
34 hg update -C 3 | 34 hg update -C 3 |
35 hg merge 4 | 35 hg merge 4 |