t / t7500 / add-contenton commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1#!/bin/sh
   2echo "commit message" >> "$1"
   3exit 0