From: Eric Engestrom <eric@engestrom.ch>
Date: Wed, 29 Jul 2020 11:27:51 +0000 (+0200)
Subject: pick-ui: specify git commands in "resolve cherry pick" message
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e3069c4257730acd09d30beb088291837ed0f884;p=mesa.git

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 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)