mergetools / gvimdiffon commit Merge branch 'sb/pack-protocol-doc-nak' into maint (593be73)
   1. "$MERGE_TOOLS_DIR/vimdiff"