[PATCH 2 of 2 stable] changectx: ancestor should only prefer merge.preferancestor if it is a revision

[Matt Mackall]

On Fri, 2014-08-15 at 02:51 +0200, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1408063604 -7200
> #      Fri Aug 15 02:46:44 2014 +0200
> # Branch stable
> # Node ID 3ceb2a936a2cf8672e53b60d8c029175c498c8ca
> # Parent  c6a530bf80a3cc127fadf7a94d96ddbf4074e837
> changectx: ancestor should only prefer merge.preferancestor if it is a revision

These are queued for stable, thanks.

-- 
Mathematics is the supreme nostalgia of our time.