Re: [PATCH] Suppress conflict resolver in dry-run merge
From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 31 Oct 2018 09:32:03 +0100
On Tue, Oct 30, 2018 at 06:39:49PM +0000, Jonathan Guy wrote:
Thank your for the patch. I am afraid I misled you earlier by suggesting
Specifically, this part of the do_merge() function in the file
/* Give the conflict resolver callback the opportunity to
So your patch is redundant and we don't need to apply it.
Regardless, thank you for your contribution!
This is an archived mail posted to the Subversion Dev mailing list.