mergetools / gvimdiff2on commit Merge tag 'v2.9.5' into maint-2.10 (d78f06a)
   1. "$MERGE_TOOLS_DIR/vimdiff"