[PATCH stable] graft: don't drop the second parent on unsuccessful merge (issue3498)

Matt Mackall mpm at selenic.com
Wed Jun 27 13:50:06 CDT 2012


On Sat, 2012-06-16 at 17:45 +0900, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara <yuya at tcha.org>
> # Date 1339833955 -32400
> # Branch stable
> # Node ID 85bddcd2699d6928b9395ee413a5e5097a9f4d6c
> # Parent  d1a0ac9b6b8aa9b18edad7943cd001e6fe800f09
> graft: don't drop the second parent on unsuccessful merge (issue3498)

Queued for stable, thanks.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list