Patch 2233: resolve issue1819: external-merge and no-allow-conflicts

Title	resolve issue1819: external-merge and no-allow-conflicts
Superseder		Nosy List	bf
Related Issues
Status	needs-review	Assigned To
Milestone

Created on 2022-04-12.14:49:18 by bf, last changed 2022-04-14.10:30:08 by bf.

Files
File name	Status	Uploaded	Type	Edit	Remove
patch-preview.txt		bf, 2022-04-12.14:49:17	text/x-darcs-patch
resolve-issue1819_-external_merge-and-no_allow_conflicts.dpatch		bf, 2022-04-12.14:49:17	application/x-darcs-patch

See mailing list archives for discussion on individual patches.

msg22972 (view)

Author: bf

Date: 2022-04-12.14:49:17

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.

Attachments

History
Date	User	Action	Args
2022-04-12 14:49:18	bf	create
2022-04-14 10:30:08	bf	set	status: needs-screening -> needs-review

Patch 2233 resolve issue1819: external-merge and no-allow-conflicts

Attachments