mergetools / gvimdiff2on commit Merge branch 'ah/doc-gitattributes-empty-index' into maint (86d51bb)
   1. "$MERGE_TOOLS_DIR/vimdiff"