[PATCH 2 of 6 misc] largefiles: don't prompt when one side of merge was changed but didn't change

[Matt Mackall]

On Mon, 2014-04-07 at 23:11 +0200, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1396905020 -7200
> #      Mon Apr 07 23:10:20 2014 +0200
> # Node ID 578f5c46a3389f5096c05822f868c08905e23fb7
> # Parent  ac4eb6bcdb81df536110ab0b09026539749599a0
> largefiles: don't prompt when one side of merge was changed but didn't change

I've queued this one for default, thanks.

-- 
Mathematics is the supreme nostalgia of our time.