Horizontal Merge Within a Line

[hypersw]

Here is another example of a real-life line merge.



The actual change (base to theirs) after I've taken the line out to a separate...

[hypersw]

Ah I've got into this again.
I've tried again Araxis to see if they have anything to offer.
There's a bonus that they have wrapping in the...

[hypersw]

Any chance on seeing this as a feature in some not too distance future?)

[hypersw]

I'm often doing complex merges, and I'm generally very much pleased with how Beyond Compare helps me handle conflicts in code blocks.
Until it comes...