mergetools / gvimdiff3on commit Make sure that index-pack --strict checks tag objects (f99b7af)
   1. "$MERGE_TOOLS_DIR/vimdiff"