diff -r a1141f04e368 -r bcf29565d89f tests/test-double-merge.t
--- a/tests/test-double-merge.t	Sat Feb 09 15:43:02 2013 +0000
+++ b/tests/test-double-merge.t	Fri Feb 08 15:23:23 2013 +0000
@@ -33,7 +33,7 @@
      src: 'foo' -> dst: 'bar' *
     checking for directory renames
   resolving manifests
-   overwrite: False, partial: False
+   branchmerge: True, force: False, partial: False
    ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104
    foo: remote copied to bar -> m
     preserving foo for resolve of bar