Request: more conflict resoluition options

[pasa]

The most common conflict resolution is replace from left or right -- we have that alright.

The next most common is to combine them. It would be way more pleasant to work with the tool if I could ask Replace with left+right and right+left. That would have the same effect as using replace on one and prepend/append of the other.

And having keyboard accelerators for all those events would just rock.

[jeffhostetler]

You can right-click on a change/conflict and prepend/append each side.
Takes 2 steps, but doable.

Yeah, it would be nice to have a single click to apply both sides
in either order.

I'll log this.

thanks
jeff