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