Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle
From: Johannes Sixt <hidden>
Date: 2021-06-11 16:53:47
Am 11.06.21 um 16:25 schrieb Felipe Contreras:
Personally I have never experienced what you posted, so maybe there's something else happening behind the scenes.
I have to do a lot of criss-cross merges lately.
Maybe merge-ort changed something.
It produces the same result. -- Hannes