mergetools / gvimdiff2on commit Merge branch 'tg/memfixes' into maint (dd5c88a)
   1. "$MERGE_TOOLS_DIR/vimdiff"