Bug 435921

Summary: Word-wrapping in the merge panel
Product: [Applications] kdiff3 Reporter: Brendon Higgins <brendon>
Component: applicationAssignee: michael <reeves.87>
Status: REPORTED ---    
Severity: wishlist CC: yga1vsm0
Priority: NOR    
Version First Reported In: unspecified   
Target Milestone: ---   
Platform: Other   
OS: Linux   
Latest Commit: Version Fixed/Implemented In:
Sentry Crash Report:

Description Brendon Higgins 2021-04-19 16:32:25 UTC 
Hi,

I use kdiff3 on LaTeX documents which tend to have long lines. The diff windows can be word-wrapped, which is very helpful for this situation. But there doesn't seem to be a way to similarly word-wrap the contents of the merge panel.

I can scroll left-right as a work-around, although that also scrolls the diff windows. That doesn't really make sense while they have word-wrapping enabled, and makes the manual process that much more difficult.

Word-wrap in the merge panel would be helpful when merging documents with long lines.

Best,
Brendon
Comment 1 yga1vsm0 2024-09-24 11:04:07 UTC 
It would indeed really help. I use KDiff as a merge conflicts handler in git projects with many text blocks in markdown. Word wrapping in differences windows but not in the ouput window is a paradox: although you can detect two modifications (in two different versions) that you would like to keep, applying manual corrections in the ouput window is difficult to achieve when it is not at the very beginning of the textblock.

That feature would also help with https://bugs.kde.org/show_bug.cgi?id=158562 .