Mercurial > public > mercurial-scm > hg-stable

diff tests/test-update-reverse.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 760c0d67ce5e
children e2dc5397bc82
line wrap: on
line diff
--- a/tests/test-update-reverse.t	Sat Feb 09 15:43:02 2013 +0000
+++ b/tests/test-update-reverse.t	Fri Feb 08 15:23:23 2013 +0000
@@ -66,7 +66,7 @@
 
   $ hg update --debug -C 1
   resolving manifests
-   overwrite: True, partial: False
+   branchmerge: False, force: True, partial: False
    ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf
    side1: other deleted -> r
    side2: other deleted -> r