mergetools / bc3on commit unpack-trees: do not fail reset because of unmerged skipped entry (b33fdfc)
   1. "$MERGE_TOOLS_DIR/bc"