--- a/tests/test-largefiles.t	Sat Feb 09 15:43:02 2013 +0000
+++ b/tests/test-largefiles.t	Fri Feb 08 15:23:23 2013 +0000
@@ -1676,7 +1676,7 @@
   $ mv 02a439e5c31c526465ab1a0ca1f431f76b827b90 empty/.hg/largefiles/
   $ hg -R http-clone --debug up --config largefiles.usercache=http-clone-usercache
   resolving manifests
-   overwrite: False, partial: False
+   branchmerge: False, force: False, partial: False
    ancestor: 000000000000, local: 000000000000+, remote: cf03e5bb9936
    .hglf/f1: remote created -> g
   updating: .hglf/f1 1/1 files (100.00%)