fixup! Commit reordering: Avoid asking about the same conflict twice

msg

Author: anordal

tests/test_rerere.py

@@ -142,10 +142,9 @@ def test_replay_resolution_recorded_by_git(repo: Repository) -> None:
         """
     )
 
-    # Git-revise may well reuse an intermediate state resolution,
-    # but actually knows that nobody expects the final state to change
-    # when just changing the order it's done: Whenever the final state
-    # is known, that pointless second conflict is bypassed.
+    # Test reusing the same recorded resolutions with git-revise.
+    # Except the last, that is: The total diff, hence the final state,
+    # of any reordering is a holy invariant.
     with editor_main(("-i", "HEAD~~")) as ed:
         flip_last_two_commits(repo, ed)