mergetools / gvimdiff3on commit Merge branch 'tr/doc-tt' into maint (073d0b0)
   1. "$MERGE_TOOLS_DIR/vimdiff"