tests/test-update-reverse.out
changeset 3320 b16456909a0a
parent 3122 2ef0b3aae186
--- a/tests/test-update-reverse.out
+++ b/tests/test-update-reverse.out
@@ -40,8 +40,8 @@ a
 side1
 side2
 resolving manifests
- overwrite True branchmerge False partial False
- ancestor ded32b0db104 local 221226fb2bd8 remote 537353581d3d
+ overwrite True partial False
+ ancestor 537353581d3d local ded32b0db104+ remote 221226fb2bd8
  side2: remote deleted -> r
  side1: remote deleted -> r
  main: remote created -> g