Mercurial > hg-stable

diff tests/test-merge-commit.t @ 18605:bcf29565d89f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 cb15835456cb
line wrap: on
line diff
--- a/tests/test-merge-commit.t	Sat Feb 09 15:43:02 2013 +0000
+++ b/tests/test-merge-commit.t	Fri Feb 08 15:23:23 2013 +0000
@@ -69,7 +69,7 @@
   $ hg --debug merge 3
     searching for copies back to rev 1
   resolving manifests
-   overwrite: False, partial: False
+   branchmerge: True, force: False, partial: False
    ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
    bar: versions differ -> m
     preserving bar for resolve of bar
@@ -156,7 +156,7 @@
   $ hg --debug merge 3
     searching for copies back to rev 1
   resolving manifests
-   overwrite: False, partial: False
+   branchmerge: True, force: False, partial: False
    ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
    bar: versions differ -> m
     preserving bar for resolve of bar