# HG changeset patch
# User Georges Racinet <georges.racinet@octobus.net>
# Date 1658227306 -7200
# Node ID 34e15bbab67cce24c7172182da1dd43c9361fcce
# Parent  4a1f0bc0713e3a78a676bda1549573568d957c3f
mergestate: action name was str

Apparently the standard for them is still to use byte strings.
Found while looking at something else

diff -r 4a1f0bc0713e -r 34e15bbab67c mercurial/mergestate.py
--- a/mercurial/mergestate.py	Wed Jul 13 18:27:40 2022 +0200
+++ b/mercurial/mergestate.py	Tue Jul 19 12:41:46 2022 +0200
@@ -159,7 +159,7 @@
 ACTION_ADD = MergeAction(b'a', narrow_safe=True, changes=CHANGE_ADDED)
 ACTION_GET = MergeAction(b'g', narrow_safe=True, changes=CHANGE_MODIFIED)
 ACTION_PATH_CONFLICT = MergeAction(b'p')
-ACTION_PATH_CONFLICT_RESOLVE = MergeAction('pr')
+ACTION_PATH_CONFLICT_RESOLVE = MergeAction(b'pr')
 ACTION_ADD_MODIFIED = MergeAction(
     b'am', narrow_safe=True, changes=CHANGE_ADDED
 )  # not 100% about the changes value here