Mercurial > hg-stable
diff tests/test-merge7.out @ 3314:b16456909a0a
merge: various tidying
update tests to handle corrected output and new workingctx display
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 10 Oct 2006 02:15:20 -0500 |
| parents | 966632304dde |
| children | 46280c004f22 |
line wrap: on
line diff
--- a/tests/test-merge7.out Tue Oct 10 02:11:59 2006 -0500 +++ b/tests/test-merge7.out Tue Oct 10 02:15:20 2006 -0500 @@ -22,11 +22,11 @@ (run 'hg heads' to see heads, 'hg merge' to merge) merge: warning: conflicts during merge resolving manifests - overwrite None branchmerge True partial False - ancestor 451c744aabcc local a070d41e8360 remote faaea63e63a9 + overwrite None partial False + ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360 test.txt: versions differ -> m merging test.txt -my test.txt@. other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9 +my test.txt@451c744aabcc+ other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9 merging test.txt failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved There are unresolved merges, you can redo the full merge using: