changeset 18605 | bcf29565d89f |
parent 18541 | 5ed6a375e9ca |
child 21266 | 19d6fec60b81 |
--- a/tests/test-merge7.t Sat Feb 09 15:43:02 2013 +0000 +++ b/tests/test-merge7.t Fri Feb 08 15:23:23 2013 +0000 @@ -81,7 +81,7 @@ $ hg merge --debug searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 test.txt: versions differ -> m preserving test.txt for resolve of test.txt