mergetools / vimdiff3on commit Merge branch 'bw/protocol-v2' into jt/partial-clone-proto-v2 (ea44c0a)
   1. "$MERGE_TOOLS_DIR/vimdiff"