Use merge-recursive in git-checkout -m (branch switching)
[git] / templates / branches--
1 : this is just to ensure the directory exists.