[PATCH RFC] merge: experimental attempt at removing prompts from merge command

Matt Mackall mpm at selenic.com
Thu Oct 14 17:03:46 CDT 2010


On Thu, 2010-10-14 at 17:00 -0500, Steve Borho wrote:
> On Sun, Oct 10, 2010 at 2:51 PM, Steve Borho <steve at borho.org> wrote:
> > # HG changeset patch
> > # User Steve Borho <steve at borho.org>
> > # Date 1286672233 18000
> > # Node ID 79ab8c99b5743eb0fdd867c2cf27848d0ac64842
> > # Parent  c6cdc123f6e4da831ca577044f5b5aefdad929f1
> > merge: experimental attempt at removing prompts from merge command
> 
> Ping.
> 
> My time window for working on this (aka: vacation) is winding down.

It looks very promising. But the code freeze is days out and this is a
pretty radical change, so it'll probably have to wait until after 1.7. 

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list