Feature Request: Merge from both sides in 3 way merge

[jlawrie]

I've been a long time DiffMerge user and for the part have been very happy with it. One thing I would like to see though is being able to merge both sides of a conflict to the resulting file in a 3 way merge. Oftentimes I find that the conflicts that can't be automatically merged need to be resolved by applying the changes from both sides. As it is right now, I can choose only to keep the left side or the right side and then need to manually copy the other side into the result.

[Beth]

Are you needing to place the changes right in the middle of each other, or just one after another?

If you see a difference, you should still be able to prepend it or append it to what you placed in. Just right-click a difference and you'll see prepend and append in the menu.

If you need changes to go inside of each other, then I will have to take a feature request.