Code

Make cherry-pick use rerere for conflict resolution.
[git.git] / contrib / workdir /
drwxr-xr-x   ..
-rwxr-xr-x 1892 git-new-workdir