mergetools / gvimdiff2on commit Merge branch 'ls/packet-line-protocol-doc-fix' into maint (a75341c)
   1. "$MERGE_TOOLS_DIR/vimdiff"