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

[David Roundy]

On Thu, Jan 17, 2008 at 05:36:41PM +0100, Tommy Pettersson wrote:
> On Thu, Jan 17, 2008 at 11:10:43AM -0500, David Roundy wrote:
> > On Jan 17, 2008 9:59 AM, Tommy Pettersson <ptp at lysator.liu.se> wrote:
> > > 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.
> > 
> > I definitely prefer the name --external-merge, or perhaps
> > --external-merge-conflicts.  The problem is that merger is a noun, not
> > a verb.
> 
> Hm, being a noun was actually my point to why I felt it was a
> better name for an option telling what external merger to use.
> But I'm not a native English speaker, so my preferences may be
> very wrong :-), and changing the name of an option can have
> other bad implications.

Right, my grammar mistake.  But merger does not mean "something that
merges" as eater would mean "something that eats", but rather "an act or
instance of merging."
-- 
David Roundy
Department of Physics
Oregon State University