diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-04-16 13:53:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-16 13:53:34 -0700 |
| commit | 7bec8e7fa6175f51e79c55e28e6b2a547a986926 (patch) | |
| tree | 771cfbec9a53d9cd46f6dabf1613d012cf619fd2 /trace2/tr2_dst.c | |
| parent | Merge branch 'en/ort-perf-batch-10' (diff) | |
| parent | Add testing with merge-ort merge strategy (diff) | |
| download | tgif-7bec8e7fa6175f51e79c55e28e6b2a547a986926.tar.xz | |
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
Diffstat (limited to 'trace2/tr2_dst.c')
0 files changed, 0 insertions, 0 deletions