[darcs-devel] darcs patch: Add --{allow, dont-allow, mark}-conflicts to darcs pull.

[Tommy Pettersson]

On Thu, Jan 17, 2008 at 03:19:43PM +0100, Nicolas Pouillard wrote:
> Hum,  what  is  the  external-merge*r* thing you talk about, I only know about
> external-merge.

I wrongly assumed the option was really called
--external-merger, because of the way I interpreted it.

> So  I  vote  for  having  --external-merge out the multi-choice group for both
> pull and apply.

Yes, me too. And perhaps it should be renamed to
--external-merger to reflect it does no longer perform a merge,
but only selects the merger to use.


-- 
Tommy Pettersson <ptp at lysator.liu.se>