When performing a 3-way merge, codediff fails to correctly populate the Result buffer if both OURS and THEIRS have different but non-overlapping additions within the same code block (e.g., a list of require statements). Instead of merging them or marking specific lines, it often leaves the Result buffer with only the common base, effectively "dropping" the new code from both sides.
Screenshots
Problem in codediff
Correct behavior in diffview:
When performing a 3-way merge, codediff fails to correctly populate the Result buffer if both OURS and THEIRS have different but non-overlapping additions within the same code block (e.g., a list of require statements). Instead of merging them or marking specific lines, it often leaves the Result buffer with only the common base, effectively "dropping" the new code from both sides.
Screenshots
Problem in codediff
Correct behavior in diffview: