gitk: Make cherry-pick call git-citool on conflicts