--- a/tests/test-issue1802.t	Sat Feb 09 15:43:02 2013 +0000
+++ b/tests/test-issue1802.t	Fri Feb 08 15:23:23 2013 +0000
@@ -55,7 +55,7 @@
     unmatched files in local:
      b
   resolving manifests
-   overwrite: False, partial: False
+   branchmerge: True, force: False, partial: False
    ancestor: a03b0deabf2b, local: d6fa54f68ae1+, remote: 2d8bcf2dda39
    a: update permissions -> e
   updating: a 1/1 files (100.00%)