Author: stsp
Date: Thu Dec 1 12:10:58 2016
New Revision: 1772182
URL: http://svn.apache.org/viewvc?rev=1772182&view=rev
Log:
Remove language from conflict resolver error messages which implies a
particular option was chosen when the error occurred.
If the same error ever gets triggered by a diff
Author: stsp
Date: Thu Dec 1 12:33:05 2016
New Revision: 1772185
URL: http://svn.apache.org/viewvc?rev=1772185&view=rev
Log:
Make it possible to resolve tree conflicts raised by nested file moves
while updating an incoming move.
* subversion/libsvn_client/conflicts.c
(verify_local_state_for_in
