Make cherry-pick use rerere for conflict resolution.
[git/wpalmer.git] / gitk-git / 
tree7948b030eb00821eb0fc6a73c33dae910c2dd605
drwxr-xr-x   ..
-rw-r--r-- 1771 Makefile
-rw-r--r-- 274337 gitk
drwxr-xr-x - po