templates / branches--on commit Open external merge tool with original file extensions for all three files (c3d51cd)
   1: this is just to ensure the directory exists.