mergetools / gvimdiff3on commit Merge branch 'tz/redirect-fix' into maint (ce73209)
   1. "$MERGE_TOOLS_DIR/vimdiff"