# HG changeset patch
# User Georges Racinet <georges.racinet@octobus.net>
# Date 2022-07-19 10:41:46
# 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 --git a/mercurial/mergestate.py b/mercurial/mergestate.py
--- a/mercurial/mergestate.py
+++ b/mercurial/mergestate.py
@@ -159,7 +159,7 @@ ACTION_REMOVE = MergeAction(b'r', narrow
 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