Code

Make cherry-pick use rerere for conflict resolution.
[git.git] / templates / branches--
1 : this is just to ensure the directory exists.