[PATCH 3 of 4] osx: install /etc/mercurial/hgrc.d/mergetools.rc and sample.rc

Kevin Bullock kbullock+mercurial at ringworld.org
Sat Aug 30 08:02:37 CDT 2014


On Aug 30, 2014, at 2:51 PM, Mads Kiilerich <mads at kiilerich.com> wrote:

> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1409402149 -7200
> #      Sat Aug 30 14:35:49 2014 +0200
> # Node ID 9fdbd8dc7fd50cc10d3784826e6f7a5b19cff771
> # Parent  3fe97f7dc300e16d338efc923f5f66a0bf960b99
> osx: install /etc/mercurial/hgrc.d/mergetools.rc and sample.rc
> 
> Give a better use experience by default.
> 
> diff --git a/setup.py b/setup.py
> --- a/setup.py
> +++ b/setup.py
> @@ -495,6 +495,11 @@ for root in ('templates',):
>             packagedata['mercurial'].append(f)
> 
> datafiles = []
> +if sys.platform == 'darwin':
> +    datafiles.append(
> +        ('/etc/mercurial/hgrc.d', ['contrib/mergetools.rc',
> +                                   'contrib/sample.rc']))

I think these are still called contrib/{mergetools,sample}.hgrc?

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



More information about the Mercurial-devel mailing list