t / t7500 / add-commentson commit unpack-trees: do not fail reset because of unmerged skipped entry (b33fdfc)
   1#!/bin/sh
   2echo "# this is a new comment" >> "$1"
   3echo "# and so is this" >> "$1"
   4exit 0