mergetools / gvimdiff3on commit Merge branch 'ad/cygwin-wants-rename' into maint (1c07e3e)
   1. "$MERGE_TOOLS_DIR/vimdiff"