From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Feb 2022 23:14:29 +0000 (-0800)
Subject: Merge branch 'en/remerge-diff'
X-Git-Tag: v2.36.0-rc0~153
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90b7153806af46ca62b85a92a2810015be2453d4;p=thirdparty%2Fgit.git

Merge branch 'en/remerge-diff'

"git log --remerge-diff" shows the difference from mechanical merge
result and the result that is actually recorded in a merge commit.

* en/remerge-diff:
  diff-merges: avoid history simplifications when diffing merges
  merge-ort: mark conflict/warning messages from inner merges as omittable
  show, log: include conflict/warning messages in --remerge-diff headers
  diff: add ability to insert additional headers for paths
  merge-ort: format messages slightly different for use in headers
  merge-ort: mark a few more conflict messages as omittable
  merge-ort: capture and print ll-merge warnings in our preferred fashion
  ll-merge: make callers responsible for showing warnings
  log: clean unneeded objects during `log --remerge-diff`
  show, log: provide a --remerge-diff capability
---

90b7153806af46ca62b85a92a2810015be2453d4