--- a/mercurial/mergestate.py Thu Jul 18 12:03:29 2024 +0200 +++ b/mercurial/mergestate.py Thu Jul 18 12:36:12 2024 +0200 @@ -495,7 +495,6 @@ class mergestate(_mergestate_base): - statepathv1 = b'merge/state' statepathv2 = b'merge/state2'