[PATCH 0 of 2 STABLE] Improve merge error detection and reporting

Matt Mackall mpm at selenic.com
Mon May 3 16:03:13 CDT 2010


On Sun, 2010-05-02 at 10:48 -0400, Greg Ward wrote:
> Finally got around to implementing the ideas from a small bikeshedding
> session a few weeks ago.
> 
> To consider:
> 
> 1) do I really need a separate script for testing merge errors?

No, feel free to wedge your tests into existing scripts.

> 2) is this stable enough for stable?

I suppose, though nothing here quite rises to the level of 'bug fix'.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list