diff -r 0890e6fd3e00 -r 838c6b72928d tests/test-issue1802.t
--- a/tests/test-issue1802.t	Sun May 12 15:35:53 2013 +0400
+++ b/tests/test-issue1802.t	Tue May 14 23:04:23 2013 +0400
@@ -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%)