[PATCH STABLE] rebase: fix selection of base used when rebasing merge (issue4041)

Matt Mackall mpm at selenic.com
Fri Nov 1 16:24:31 CDT 2013


On Wed, 2013-10-30 at 19:48 +0100, Pierre-Yves David wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
> # Date 1383158714 -3600
> #      Wed Oct 30 19:45:14 2013 +0100
> # Branch stable
> # Node ID f036489f6af80175aa6bed3025501caaa36f83df
> # Parent  1d7a36ff2615e6e12ce65681db4e07622e7b60d1
> rebase: fix selection of base used when rebasing merge (issue4041)

Queued for stable, thanks.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list