t / t7500 / add-commentson commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1#!/bin/sh
   2echo "# this is a new comment" >> "$1"
   3echo "# and so is this" >> "$1"
   4exit 0