merge script: allow custom strategies
[git] / templates / branches--
1 : this is just to ensure the directory exists.