Checkout
Stefan Sperling
committed
on 30 Jan 16
* subversion/svn/conflict-callbacks.c
(mark_conflict_resolved): Use the new client conflict API to mark
conflicts as resolved, instead … Show more
* subversion/svn/conflict-callbacks.c

 (mark_conflict_resolved): Use the new client conflict API to mark

  conflicts as resolved, instead of calling into libsvn_wc.

Show less