Mesa (master): pick-ui: specify git commands in "resolve cherry pick" message

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: e3069c4257730acd09d30beb088291837ed0f884
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e3069c4257730acd09d30beb088291837ed0f884

Author: Eric Engestrom <eric at engestrom.ch>
Date:   Wed Jul 29 13:27:51 2020 +0200

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

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

---

 bin/pick/ui.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/pick/ui.py b/bin/pick/ui.py
index 2d7b510703f..3afd05e0ca2 100644
--- a/bin/pick/ui.py
+++ b/bin/pick/ui.py
@@ -240,8 +240,8 @@ class UI:
 
             {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)