mergetools / vimdiff2on commit Merge branch 'da/difftool-git-files' into maint (01e13d0)
   1. "$MERGE_TOOLS_DIR/vimdiff"