[PATCH] convert: keep branch switching merges with ancestors (issue3340)

[Matt Mackall]

On Mon, 2012-06-18 at 18:23 +0200, Patrick Mezard wrote:
> # HG changeset patch
> # User Patrick Mezard <patrick at mezard.eu>
> # Date 1340036368 -7200
> # Node ID 50cdb4793f16b9447c29bc3ddbdf752f480096c3
> # Parent  622aa57a90b1d1f09b3204458b087de12ce2de82
> convert: keep branch switching merges with ancestors (issue3340)

Queued for default, thanks.

-- 
Mathematics is the supreme nostalgia of our time.