mergetools / vimdiff2on commit format-patch: check that header line has expected format (06dfc9e)
   1. "$MERGE_TOOLS_DIR/vimdiff"