mergetools / vimdiff2on commit Merge branch 'sb/pack-protocol-mention-smart-http' (486b51b)
   1. "$MERGE_TOOLS_DIR/vimdiff"