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

[Tommy Pettersson]

On Thu, Jan 17, 2008 at 11:39:36AM -0500, David Roundy wrote:
> On Thu, Jan 17, 2008 at 05:36:41PM +0100, Tommy Pettersson wrote:
> > But I'm not a native English speaker, so my preferences may be
> > very wrong :-)
> 
> merger does not mean "something that
> merges" as eater would mean "something that eats", but rather "an act or
> instance of merging."

Aha, I see. Thanks David.

So it should be --external-mergeror then? Just kidding! ;-)


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