From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Mar 2019 00:59:54 +0000 (+0900)
Subject: Merge branch 'en/combined-all-paths'
X-Git-Tag: v2.22.0-rc0~174
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c425d361f5bf46d99cd96d7eac3488ebb2e92b60;p=thirdparty%2Fgit.git

Merge branch 'en/combined-all-paths'

Output from "diff --cc" did not show the original paths when the
merge involved renames.  A new option adds the paths in the
original trees to the output.

* en/combined-all-paths:
  log,diff-tree: add --combined-all-paths option
---

c425d361f5bf46d99cd96d7eac3488ebb2e92b60