--- a/mercurial/mergestate.py Mon Jul 22 16:49:38 2024 +0200 +++ b/mercurial/mergestate.py Tue Jul 23 10:02:46 2024 +0200 @@ -495,6 +495,7 @@ class mergestate(_mergestate_base): + statepathv1 = b'merge/state' statepathv2 = b'merge/state2'