Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle

Elijah Newren wrote:

On Fri, Jun 11, 2021 at 7:25 AM Felipe Contreras [off-list ref]
wrote:

quoted

Personally I have never experienced what you posted, so maybe there's
something else happening behind the scenes.

Maybe merge-ort changed something.

merge-ort made no changes relative to content merges or choice of merge
bases.  (In fact, merge ort doesn't even handle content merges; that's the
xdiff layer.)  Even if merge-ort had made changes in this area, merge-ort
is not the default and I didn't see the necessary config tweaks in your
list of config options.  (I would have recommended against people using
merge ort until 7bec8e7fa6 ("Merge branch 'en/ort-readiness'", 2021-04-16),
which only made it into a release last week with 2.32.  I probably won't be
recommending it as the default at least until the optimization work is
merged and it's hard to predict how many more months that will take.)

Indeed, I tested on v2.25 and found the same output.

I thought of merge-ort because 1) I've never seen such kind of output
before, and 2) grepping the code I thought I saw merge-ort being the
default of something, but now I seem to be unable to find where.

It's more likely that the codebases you work with just don't have
criss-cross merges.

Yes, that's it.

I don't see why people in these kinds of codebases would like diff3
doing that by default.

Cheers.

-- 
Felipe Contreras