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>
This commit is contained in:
parent
b238d17a02
commit
e3069c4257
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue