Merge branch 'en/merge-path-collision'
[git] / templates / branches--
1 : this is just to ensure the directory exists.