From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Jan 2021 07:33:44 +0000 (-0800)
Subject: Merge branch 'en/merge-ort-2'
X-Git-Tag: v2.31.0-rc0~148
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=85cf82ff01ed975c31b75540afb1b251da5259fd;p=thirdparty%2Fgit.git

Merge branch 'en/merge-ort-2'

More "ORT" merge strategy.

* en/merge-ort-2:
  merge-ort: add modify/delete handling and delayed output processing
  merge-ort: add die-not-implemented stub handle_content_merge() function
  merge-ort: add function grouping comments
  merge-ort: add a paths_to_free field to merge_options_internal
  merge-ort: add a path_conflict field to merge_options_internal
  merge-ort: add a clear_internal_opts helper
  merge-ort: add a few includes
---

85cf82ff01ed975c31b75540afb1b251da5259fd