mergetools / vimdiff3on commit Merge branch 'sp/pack-protocol-doc-on-shallow' (346fad5)
   1. "$MERGE_TOOLS_DIR/vimdiff"