]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'dl/diff-usage-comment-update'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Jun 2020 21:17:25 +0000 (14:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Jun 2020 21:17:25 +0000 (14:17 -0700)
An in-code comment in "git diff" has been updated.

* dl/diff-usage-comment-update:
  builtin/diff: fix botched update of usage comment
  builtin/diff: update usage comment

1  2 
builtin/diff.c

diff --cc builtin/diff.c
Simple merge