[PATCH] resolve SVN conflicts

["Matthijs van de Water" <matthijs van de water gmail com>]

Hi,

I've been using Meld to resolve SVN conflicts for some time now and
was annoyed by the fact it didn't have a menu-option to mark a
conflicted file as resolved.

I've made a patch which works for me (probably breaks on CVS, not
sure) which can serve as a basis for supporting this feature in a
future version.

See Bugzilla:
http://bugzilla.gnome.org/show_bug.cgi?id=403193

I'm not subscribed to this list, so please 'reply-to-all'.

Regards,
--
Matthijs van de Water      | iRex Technologies B.V.
Embedded Software Engineer | www.irextechnologies.com