mergetools / gvimdiff2on commit Merge branch 'rj/no-xopen-source-for-cygwin' into maint (f69f5f1)
   1. "$MERGE_TOOLS_DIR/vimdiff"