t / t7500 / add-commentson commit merge-recursive: Provide more info in conflict markers with file renames (3c217c0)
   1#!/bin/sh
   2echo "# this is a new comment" >> "$1"
   3echo "# and so is this" >> "$1"
   4exit 0