From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 9 Jul 2020 21:00:43 +0000 (-0700)
Subject: Merge branch 'ct/diff-with-merge-base-clarification' into master
X-Git-Tag: v2.28.0-rc0~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46be023084bd6ce4958f16427da7cdaf91cff205;p=thirdparty%2Fgit.git

Merge branch 'ct/diff-with-merge-base-clarification' into master

Recent update to "git diff" meant as a code clean-up introduced a
bug in its error handling code, which has been corrected.

* ct/diff-with-merge-base-clarification:
  diff: check for merge bases before assigning sym->base
---

46be023084bd6ce4958f16427da7cdaf91cff205