merge.conflictstyle: choose between "merge" and "diff3 -m" styles

[git] / t / t7500 / add-comments

#!/bin/sh
echo "# this is a new comment" >> "$1"
echo "# and so is this" >> "$1"
exit 0