diff-merges: let new options enable diff without -p
[git] / templates / branches--
1 : this is just to ensure the directory exists.