From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 16 Apr 2021 20:53:34 +0000 (-0700)
Subject: Merge branch 'en/ort-readiness'
X-Git-Tag: v2.32.0-rc0~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7bec8e7fa6175f51e79c55e28e6b2a547a986926;p=thirdparty%2Fgit.git

Merge branch 'en/ort-readiness'

Plug the ort merge backend throughout the rest of the system, and
start testing it as a replacement for the recursive backend.

* en/ort-readiness:
  Add testing with merge-ort merge strategy
  t6423: mark remaining expected failure under merge-ort as such
  Revert "merge-ort: ignore the directory rename split conflict for now"
  merge-recursive: add a bunch of FIXME comments documenting known bugs
  merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict
  t: mark several submodule merging tests as fixed under merge-ort
  merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries
  t6428: new test for SKIP_WORKTREE handling and conflicts
  merge-ort: support subtree shifting
  merge-ort: let renormalization change modify/delete into clean delete
  merge-ort: have ll_merge() use a special attr_index for renormalization
  merge-ort: add a special minimal index just for renormalization
  merge-ort: use STABLE_QSORT instead of QSORT where required
---

7bec8e7fa6175f51e79c55e28e6b2a547a986926
diff --cc merge-ort.c
index 028d712f54,8258d3fd62..d1f4cf8a1f
--- a/merge-ort.c
+++ b/merge-ort.c
@@@ -25,6 -26,6 +26,7 @@@
  #include "diff.h"
  #include "diffcore.h"
  #include "dir.h"
++#include "entry.h"
  #include "ll-merge.h"
  #include "object-store.h"
  #include "revision.h"