pick-ui: specify git commands in "resolve cherry pick" message

Cc: mesa-stable
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6134>

diff --git a/bin/pick/ui.py b/bin/pick/ui.py
index 2d7b510703f5bdac5788285ada5cdd0209f414ba..3afd05e0ca28e14018e402fdd4844744b7c5e86f 100644 (file)
--- a/bin/pick/ui.py
+++ b/bin/pick/ui.py
@@ -240,8 +240,8 @@ class UI:
 
             {err}
 
 
             {err}
 

-            You can either cancel, or resolve the conflicts, commit the
-            changes and select ok."""))
+            You can either cancel, or resolve the conflicts (`git mergetool`), finish the
+            cherry-pick (`git cherry-pick --continue`) and select ok."""))

 
         can_btn = urwid.Button('Cancel')
         urwid.connect_signal(can_btn, 'click', reset_cb)
 
         can_btn = urwid.Button('Cancel')
         urwid.connect_signal(can_btn, 'click', reset_cb)