Mercurial > hg-stable

diff tests/test-issue522.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 b87acfda5268
children e2dc5397bc82
line wrap: on
line diff
--- a/tests/test-issue522.t	Sat Feb 09 15:43:02 2013 +0000
+++ b/tests/test-issue522.t	Fri Feb 08 15:23:23 2013 +0000
@@ -29,7 +29,7 @@
     unmatched files in local:
      bar
   resolving manifests
-   overwrite: False, partial: False
+   branchmerge: True, force: False, partial: False
    ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee
    foo: remote is newer -> g
   updating: foo 1/1 files (100.00%)