mergetools / vimdiff3on commit Merge branch 'jk/difftool-in-subdir' into maint (a558332)
   1. "$MERGE_TOOLS_DIR/vimdiff"