mergetools / gvimdiff2on commit Merge branch 'da/difftool' into maint (aa0b4c3)
   1. "$MERGE_TOOLS_DIR/vimdiff"