mergetools / gvimdiff3on commit Merge branch 'maint-2.9' into maint-2.10 (fc92b08)
   1. "$MERGE_TOOLS_DIR/vimdiff"