[PATCH] plan9: initial support for plan 9 from bell labs
Steven Stallion
sstallion at gmail.com
Sun Apr 8 01:14:09 CDT 2012
On Sat, Apr 7, 2012 at 10:50 PM, Steven Stallion <sstallion at gmail.com> wrote:
> On Sat, Apr 7, 2012 at 10:36 AM, Matt Mackall <mpm at selenic.com> wrote:
>> On Fri, 2012-04-06 at 14:42 -0700, Steven Stallion wrote:
>>> +idiff(1) may be used to resolve merge conflicts, however it is not
>>> +enabled by default. Users should use the following configuration snippet
>>> +to enable this behavior:
>>> +
>>> + [ui]
>>> + merge = idiff
>>
>> This is the old way of configuring merge tools. You should probably add
>> an idiff entry to the generic mergetools/config.hgrc.
>
> Will do.
Scratch that. I'll just keep idiff out. I'm not sure this will really
be used by anyone. Having it in mergetools.hgrc just doesn't feel
quite right.
>> Seems like this name should have a 9 in it.
>
> Sure thing. hg9diff?
I think 9diff will be a little clearer here. hg9diff feels a bit repetitive.
Steve
More information about the Mercurial-devel
mailing list