mergetools / gvimdiffon commit Merge branch 'nd/index-pack-error-message' into maint (3dd1083)
   1. "$MERGE_TOOLS_DIR/vimdiff"