gitk: Make cherry-pick call git-citool on conflicts
tree12cda3cd4a56254686ca32a511312cd22eadc59f
-rw-r--r-- 1771 Makefile
-rwxr-xr-x 292319 gitk
drwxr-xr-x - po