Junio C Hamano 20283a3f10 Merge branch 'en/ort-readiness' into next ... 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		2021-04-08 15:59:38 -07:00
..
config
util
install-dependencies.sh
install-docker-dependencies.sh
lib.sh
make-test-artifacts.sh
mount-fileshare.sh
print-test-failures.sh
run-build-and-tests.sh
run-docker-build.sh
run-docker.sh
run-static-analysis.sh
run-test-slice.sh
test-documentation.sh