mergetools / gvimdiff3on commit Merge branch 'jl/zlib-restore-nul-termination' (faff812)
   1. "$MERGE_TOOLS_DIR/vimdiff"