t / t7500 / add-commentson commit git-merge-recursive: learn to honor merge.conflictstyle (c236bcd)
   1#!/bin/sh
   2echo "# this is a new comment" >> "$1"
   3echo "# and so is this" >> "$1"
   4exit 0