[PATCH 2 of 2] convert: optimize convert of files that are unmodified from p2 in merges

[Matt Mackall]

On Thu, 2015-03-19 at 17:53 +0100, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1426783219 -3600
> #      Thu Mar 19 17:40:19 2015 +0100
> # Branch stable
> # Node ID 139b6ea742ba3aa8bb8c84598c2632cf1783aa00
> # Parent  b446163ce0c69e748e8e51b2261540fcb0fc5bba
> convert: optimize convert of files that are unmodified from p2 in merges

These are queued for default, thanks. FYI, they needed some merge
fixups.

-- 
Mathematics is the supreme nostalgia of our time.