mergetools / gvimdiff3on commit Merge branch 'maint-2.4' into maint-2.5 (531788a)
   1. "$MERGE_TOOLS_DIR/vimdiff"