mergetools / gvimdiff3on commit Merge branch 'rs/apply-fuzzy-match-fix' into maint (df481b9)
   1. "$MERGE_TOOLS_DIR/vimdiff"