summaryrefslogtreecommitdiff
path: root/t/t6408-merge-up-to-date.sh
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-03-20 00:03:51 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-03-20 12:35:40 -0700
commitaa2faac03ad646873ebac2b230581d1d26dd1b99 (patch)
treee38b8effb1600ec1123ff56a3331b890367c46a0 /t/t6408-merge-up-to-date.sh
parentmerge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries (diff)
downloadtgif-aa2faac03ad646873ebac2b230581d1d26dd1b99.tar.xz
t: mark several submodule merging tests as fixed under merge-ort
merge-ort handles submodules (and directory/file conflicts in general) differently than merge-recursive does; it basically puts all the special handling for different filetypes into one place in the codebase instead of needing special handling for different filetypes in many different code paths. This one code path in merge-ort could perhaps use some work still (there are still test_expect_failure cases in the testsuite), but it passes all the tests that merge-recursive does as well as 12 additional ones that merge-recursive fails. Mark those 12 tests as test_expect_success under merge-ort. Signed-off-by: Elijah Newren <newren@gmail.com> Reviewed-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6408-merge-up-to-date.sh')
0 files changed, 0 insertions, 0 deletions