mergetools / gvimdiff3on commit Merge branch 'mh/release-commit-memory-fix' (21ce0b4)
   1. "$MERGE_TOOLS_DIR/vimdiff"