Index: merge_tests.py
===================================================================
--- merge_tests.py	(revision 22100)
+++ merge_tests.py	(working copy)
@@ -1580,7 +1579,9 @@
   # In the working copy, attempt to 'svn merge branch_A_url@2 A_url@3 A'.
   # We should *not* see a conflict during the merge, but an 'A'.
   # And after the merge, the status should not report any differences.
+  ### This "G" is probably not correct...
   expected_output = wc.State(short_wc, {
+    "A"       : Item(status=" G"),
     "A/theta" : Item(status="A "),
     })
 
@@ -1594,7 +1595,6 @@
     })
   expected_status = svntest.actions.get_virginal_state(short_wc, 1)
   expected_status.add({
-    #"A"       : Item(status=" M", wc_rev=1),
     "A/theta" : Item(status="  ", wc_rev=3),
     })
   expected_status.remove("")  # top-level of the WC