mergetools / gvimdiff3on commit Merge branch 'jh/memihash-opt' into maint (a4478c9)
   1. "$MERGE_TOOLS_DIR/vimdiff"