Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge7.out @ 5371:17ed9b9a0d03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add debug diagnostics for findcopies
author Matt Mackall <mpm@selenic.com>
date Thu, 04 Oct 2007 19:44:37 -0500
parents 93a4e72b4f83
children
comparison
equal deleted inserted replaced
5370:61462e7d62ed 5371:17ed9b9a0d03
22 (run 'hg heads' to see heads, 'hg merge' to merge) 22 (run 'hg heads' to see heads, 'hg merge' to merge)
23 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 searching for copies back to rev 1
27 test.txt: versions differ -> m 28 test.txt: versions differ -> m
28 merging test.txt 29 merging test.txt
29 my test.txt@451c744aabcc+ other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9 30 my test.txt@451c744aabcc+ other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9
30 merging test.txt failed! 31 merging test.txt failed!
31 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