t / t7500 / add-commentson commit Try normalizing files to avoid delete/modify conflicts when merging (331a183)
   1#!/bin/sh
   2echo "# this is a new comment" >> "$1"
   3echo "# and so is this" >> "$1"
   4exit 0