Merge branch 'fc/rerere-conflict-style' into maint
[git] / templates / branches--
1 : this is just to ensure the directory exists.