tests/test-copy-move-merge.t

--- a/tests/test-copy-move-merge.t	Sat Feb 09 15:43:02 2013 +0000
+++ b/tests/test-copy-move-merge.t	Fri Feb 08 15:23:23 2013 +0000
@@ -29,7 +29,7 @@
      src: 'a' -> dst: 'c' *
     checking for directory renames
   resolving manifests
-   overwrite: False, partial: False
+   branchmerge: True, force: False, partial: False
    ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6
    a: remote moved to b -> m
     preserving a for resolve of b