1 patch for repository http://darcs.net/screened:
patch becf205173637204bf049ef4d67f1432f4d212e1
Author: Ben Franksen <ben.franksen@online.de>
Date: Tue Apr 12 16:32:40 CEST 2022
* resolve issue1819: external-merge and no-allow-conflicts
The fix is simply to remove the code that deliberately tests for the
external-merge option before failing in announceConflicts.