t / t7500 / add-contenton commit merge_content(): Check whether D/F conflicts are still present (4ab9a15)
   1#!/bin/sh
   2echo "commit message" >> "$1"
   3exit 0