From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 6 Feb 2021 00:40:44 +0000 (-0800)
Subject: Merge branch 'en/ort-conflict-handling'
X-Git-Tag: v2.31.0-rc0~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b65b9ff1ff8a809246cc6bd8ad9051b28e5bf330;p=thirdparty%2Fgit.git

Merge branch 'en/ort-conflict-handling'

ORT merge strategy learns more support for merge conflicts.

* en/ort-conflict-handling:
  merge-ort: add handling for different types of files at same path
  merge-ort: copy find_first_merges() implementation from merge-recursive.c
  merge-ort: implement format_commit()
  merge-ort: copy and adapt merge_submodule() from merge-recursive.c
  merge-ort: copy and adapt merge_3way() from merge-recursive.c
  merge-ort: flesh out implementation of handle_content_merge()
  merge-ort: handle book-keeping around two- and three-way content merge
  merge-ort: implement unique_path() helper
  merge-ort: handle directory/file conflicts that remain
  merge-ort: handle D/F conflict where directory disappears due to merge
---

b65b9ff1ff8a809246cc6bd8ad9051b28e5bf330