On 3/9/2021 1:24 AM, Elijah Newren via GitGitGadget wrote: > From: Elijah Newren <newren@xxxxxxxxx> > > 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. Nice! -Stolee
