Merge branch 'bw/protocol-v2'
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2018 17:30:50 +0000 (10:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2018 17:30:51 +0000 (10:30 -0700)
Doc fix.

* bw/protocol-v2:
config: document value 2 for protocol.version

1  2 
Documentation/config.txt
Simple merge