changeset 2830 | 49988d9f0758 |
parent 2283 | e506c14382fd |
child 2979 | 92a0c2200e41 |
--- a/tests/test-merge7.out Tue Aug 08 10:56:48 2006 -0500 +++ b/tests/test-merge7.out Wed Aug 09 13:55:18 2006 -0500 @@ -22,7 +22,7 @@ (run 'hg heads' to see heads, 'hg merge' to merge) merge: warning: conflicts during merge resolving manifests - force False allow True moddirstate True linear False + overwrite None branchmerge True partial False linear False ancestor 055d847dd401 local 2eded9ab0a5c remote 84cf5750dd20 test.txt versions differ, resolve merging test.txt