Merge branch 'pb/doc-external-diff-env'
authorJunio C Hamano <redacted>
Thu, 3 Sep 2020 19:37:09 +0000 (12:37 -0700)
committerJunio C Hamano <redacted>
Thu, 3 Sep 2020 19:37:09 +0000 (12:37 -0700)
Doc update.

* pb/doc-external-diff-env:
  git.txt: correct stale 'GIT_EXTERNAL_DIFF' description

1  2 
Documentation/git.txt

Simple merge
git clone https://git.99rst.org/PROJECT