mergetools / gvimdiffon commit Merge branch 'nd/dir-exclude-cleanup' into maint (af3e464)
   1. "$MERGE_TOOLS_DIR/vimdiff"