display wrap

Are there any behaviour changes you would expect to go along with this? In character editing mode, I would expect the up, down, page up, and page down keys to skip to different positions depending on the word wrap state. I'm unclear on what should happen in line editing mode. Any thoughts?

This is a helpful suggestion, especially for those of us who have to do 3-way merges on code with long lines. So, how to handle the line editing? Read on for one approach.

Other tools (like BeyondCompare and some tools bundled with versioning systems like Perforce and ClearCase) deal with this by having a "result" pane which is below the "input" panes. The result pane takes up the full width of the UI but shows only a few lines. Just below the results pane there are N line buffers, one from each of the input panes, depending on where the focus is in each input pane. Each of these N lines is editable; changes are reflected in the corresponding source pane. The user can then choose which of the N lines should go into the result pane.

My explanation is not the greatest. Let me know if you want some screenshots from other tools.

I like this program but I miss this feature a lot. The program Meld
has implemented a natural and efficient line-wrap editing behavior
which could possibly serve as an example to follow.

In case someone would like to attempt to implement this functionality,
would it be possible to know some of the more difficult areas, to get
an idea how big the task is?

Thank you!