Please implement manual alignment in the diff viewer.

[vruyr]

Problem description

Often times the diff algorithm fails to match lines and the resulting diff is larger than it has to be. This is especially a big problem with merge conflict resolution.

Preferred solution

Please implement a feature where a selection of text on the left could be declared corresponding to a selection on the right. that should also visually align corresponding lines.

Alternatives

Beyond Compare have a manual alignment feature.

[bmcdonnell-fb]

As another point of reference, you can also do this in KDiff3 (Ctrl+Y, or Diffview → Add Manual Diff Alignment).