[PATCH] Fix meld.args in mergetools.rc: add -o $output

[Giorgos Keramidas]

On Mon, 11 Mar 2013 17:41:35 +0100, Angel Ezquerra <angel.ezquerra at gmail.com> wrote:
>On Mon, Mar 11, 2013 at 4:19 PM, Völker Ronny <ronny.voelker at elaxy.de> wrote:
>>Angel Ezquerra <angel.ezquerra at gmail.com> wrote:
>>> On Fri, Feb 22, 2013 at 9:11 PM, Angel Ezquerra <angel.ezquerra at gmail.com> wrote:
>>> Also, he mentioned that his preference would be to do:
>>>
>>> "$local $output $base" with "premerge = True" on the mercurial config side
>>> (and the appropriate --label parameters of course). He said that in that case
>>> using the "--auto-merge" flag would be unnecessary. The only drawback is
>>> that you lose ancestor information, but in his opinion it is a good trade off.
>>>
>>> Cheers,
>>>
>>> Angel
>>
>> I have no problem with renaming the center pane to 'merged'.
>> On the other hand , loosing ancestor information makes me a bit
>> uneasy. So I would rather do without automatic merging for now.
>
> I made a mistake on my previous email when I copied the meld
> developer's advice. He suggested using "$local $output $other".
>
> I think that we should follow his advice (he should be the one who
> knows his tool the best, after all).. If he suggests that we should
> use premerge = True and "$local $output $other", I think that is what
> we should do too.

I'm confused by this patch.  I've been using the following to launch
meld for 3-way merges:

  [merge-tools]
  meld.priority = 3
  meld.binary = meld
  meld.gui = True
  meld.args = --label='local' $local --label='base' $base --label='other' $other

This seems to work fine for merged without the need for -o output.

Why would we need to add --output?  Wouldn't that have to be the same as
the value of $local anyway?