Skip to content
Snippets Groups Projects
Commit ebfe0698 authored by Eric Engestrom's avatar Eric Engestrom :no_entry:
Browse files

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


Cc: mesa-stable
Signed-off-by: Eric Engestrom's avatarEric Engestrom <eric@engestrom.ch>
Part-of: <!6134>
(cherry picked from commit e3069c42)
parent cad3caba
No related branches found
No related tags found
Loading
......@@ -3649,7 +3649,7 @@
"description": "pick-ui: specify git commands in \"resolve cherry pick\" message",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": null
},
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment