templates / branches--on commit Add -y/--no-prompt option to mergetool (682b451)
   1: this is just to ensure the directory exists.