Merge branch 'rj/maint-difftool-cygwin-workaround'
[git] / templates / branches--
1 : this is just to ensure the directory exists.