gitk: Fix some bugs in the new cherry-picking code
-rwxr-xr-x 174215 gitk