On Tue, Nov 29, 2016 at 10:19:03PM +0100, Stefan Sperling wrote: > (Running 'svn add DIR' after > 'svn revert -R DIR' will also merge the files, but schedules an undesirable > replacement as well.)
Sorry, the above should say 'svn resolved DIR' instead of 'svn revert -R DIR'.
