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

[Kevin Bullock]

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.

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock