mergetools / gvimdiff3on commit Merge branch 'jk/info-alternates-fix' into maint (5a80d1d)
   1. "$MERGE_TOOLS_DIR/vimdiff"