tests/test-issue522.t

--- a/tests/test-issue522.t	Fri Dec 09 15:50:33 2011 +0100
+++ b/tests/test-issue522.t	Fri Dec 09 17:34:53 2011 +0100
@@ -29,8 +29,8 @@
     unmatched files in local:
      bar
   resolving manifests
-   overwrite None partial False
-   ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee
+   overwrite: False, partial: False
+   ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee
    foo: remote is newer -> g
   updating: foo 1/1 files (100.00%)
   getting foo