[PATCH] mergetools.rc: find OSX FileMerge in the new location inside Xcode 4.3

[Matt Mackall]

On Fri, 2015-10-16 at 11:37 +0200, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1444988254 -7200
> #      Fri Oct 16 11:37:34 2015 +0200
> # Node ID 8a524df4a092bdc9c2022f0e0ad09e2976e9d2b0
> # Parent  07db7e95c464537aeb2dd7aba39de0813eaffd04
> mergetools.rc: find OSX FileMerge in the new location inside Xcode 4.3

Queued for default, thanks.

-- 
Mathematics is the supreme nostalgia of our time.