t / t7500 / add-commentson commit xdiff-merge: optionally show conflicts in "diff3 -m" style (e0af48e)
   1#!/bin/sh
   2echo "# this is a new comment" >> "$1"
   3echo "# and so is this" >> "$1"
   4exit 0