Merge branch 'jc/combine-diff-many-parents'
[git] / templates / branches--
1 : this is just to ensure the directory exists.