Mercurial > public > mercurial-scm > hg-stable
diff tests/test-merge-types.t @ 18605:bcf29565d89f
manifestmerge: pass in branchmerge and force separately
This will be used in an upcoming patch.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Fri, 08 Feb 2013 15:23:23 +0000 |
| parents | 5ed6a375e9ca |
| children | 0b50788c160c |
line wrap: on
line diff
--- a/tests/test-merge-types.t Sat Feb 09 15:43:02 2013 +0000 +++ b/tests/test-merge-types.t Fri Feb 08 15:23:23 2013 +0000 @@ -32,7 +32,7 @@ $ hg merge --debug searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c a: versions differ -> m preserving a for resolve of a @@ -65,7 +65,7 @@ $ hg merge --debug searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f a: versions differ -> m preserving a for resolve of a @@ -99,7 +99,7 @@ $ HGMERGE= hg up -y --debug searching for copies back to rev 2 resolving manifests - overwrite: False, partial: False + branchmerge: False, force: False, partial: False ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f a: versions differ -> m preserving a for resolve of a