Pavel Hlavnicka <pavel@gingerall.cz>


Patch
r851920

r851920 | xsteve | 2004-11-11 15:08:02 -0600 (Thu, 11 Nov 2004)

Added support to resolve conflicts.

Patch by: Pavel Hlavnicka <pavel@gingerall.cz>

* trunk/contrib/client-side/psvn/psvn.el:
  (svn-resolve-conflicts-ediff): New function. Use ediff to resolve conflicts
  (svn-status-resolve-conflicts): New function, bound to ?X.
    Resolve conflicts when possible/necessary.