mergetools / gvimdiff3on commit Merge branch 'pt/t0302-needs-sanity' into maint (e9da4e6)
   1. "$MERGE_TOOLS_DIR/vimdiff"