stricter text conflicts in 1.10
From: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 9 May 2017 12:14:20 +0200
I have seen several instances of proposals in our STATUS file where I
I suppose most of us use 1.9.x clients to do such merges, because
This is probably due to the stricter text conflict checks added in r1731699.
And with the conflict resolver we are trying to make tree conflicts less
This is an archived mail posted to the Subversion Dev mailing list.