[PATCH] More descriptive messages for conflict cases in merges
[git.git] / templates / branches--
1 : this is just to ensure the directory exists.