[FEATURE ] gconflicts needs a resolve widget

The utility of the conflicts dialogue would be increased enormously by the ability to resolve conflicts after editing.

Perhaps add a checkbox column to the list.

Or take the TSVN example of a context menu, which allows the choice of resolve by taking THIS, BASE or OTHER as well as editing.

I'd implement this feature now if I had time, but I don't, so I'm at least tracking it.