mergetools / gvimdiff2on commit Merge branch 'ew/autoconf-pthread' into maint (f98a20c)
   1. "$MERGE_TOOLS_DIR/vimdiff"