1 --- git-2.29.0/gitk-git/gitk.orig 2020-10-19 21:40:17.774293686 +0200
2 +++ git-2.29.0/gitk-git/gitk 2020-10-19 21:43:33.023626764 +0200
5 # Unfortunately git-cherry-pick writes stuff to stderr even when
6 # no error occurs, and exec takes that as an indication of error...
7 - if {[catch {exec sh -c "git cherry-pick -r $rowmenuid 2>&1"} err]} {
8 + if {[catch {exec sh -c "git cherry-pick -x -r $rowmenuid 2>&1"} err]} {
11 {Entry '(.*)' (would be overwritten by merge|not uptodate)} \