--- 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%)