tests/test-update-reverse.out
changeset 2822 30f59f4a327e
parent 2175 b2ae81a7df29
child 2830 49988d9f0758
--- a/tests/test-update-reverse.out
+++ b/tests/test-update-reverse.out
@@ -40,7 +40,7 @@ a
 side1
 side2
 resolving manifests
- force 1 allow None moddirstate True linear False
+ force True allow False moddirstate True linear False
  ancestor 8515d4bfda76 local 1c0f48f8ece6 remote 0594b9004bae
 remote deleted side2, clobbering
 remote deleted side1, clobbering