mergetools / vimdiff3on commit Merge branch 'cb/curl-use-xmalloc' (a2e524e)
   1. "$MERGE_TOOLS_DIR/vimdiff"