From: Junio C Hamano <redacted>
Date: Mon, 5 Oct 2020 21:01:54 +0000 (-0700)
Subject: Merge branch 'jk/diff-cc-oidfind-fix'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=7da656f1e083b065400c4ab92405c6332481eb7a;p=git.git

Merge branch 'jk/diff-cc-oidfind-fix'

"log -c --find-object=X" did not work well to find a merge that
involves a change to an object X from only one parent.

* jk/diff-cc-oidfind-fix:
  combine-diff: handle --find-object in multitree code path
---

7da656f1e083b065400c4ab92405c6332481eb7a