[PATCH] contrib: add OS X p4merge to mergetools.hgrc

[Pierre-Yves David]

On 08/29/2014 05:40 AM, Kevin Bullock wrote:
> On Aug 29, 2014, at 11:58 AM, Mads Kiilerich <mads at kiilerich.com> wrote:
>
>> # HG changeset patch
>> # User Mads Kiilerich <madski at unity3d.com>
>> # Date 1409150384 -7200
>> #      Wed Aug 27 16:39:44 2014 +0200
>> # Node ID 75cb36c761b37c16663fa31f60d010d5a38c91d4
>> # Parent  926bc0d3b595caf37c5d70833a347eb43285de2f
>> contrib: add OS X p4merge to mergetools.hgrc
>
> Looks fine to me. Crew at will.

pushed to the clowncopter

-- 
Pierre-Yves David