[PATCH 1 of 1] subrepo: fix for merge inconsistencies

[Matt Mackall]

On Wed, 2012-02-29 at 15:27 +0100, Friedrich Kastner-Masilko wrote:
> # HG changeset patch
> # User Friedrich Kastner-Masilko <kastner_masilko at at.festo.com>
> # Date 1330521897 -3600
> # Node ID 8980b37cb4a68bae7864df425d0d1a0151491b24
> # Parent  a4413624d0146f1edaa712a32c36c3409209ed6a
> subrepo: fix for merge inconsistencies

Looks good, queued for stable.

-- 
Mathematics is the supreme nostalgia of our time.