git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Matthew Groth <mgroth49@gmail.com>
To: Samuel Lijin <sxlijin@gmail.com>, davvid@gmail.com
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [fixed] error using `git mergetool --tool=meld`
Date: Wed, 17 May 2017 00:28:02 -0400	[thread overview]
Message-ID: <449621d5-c645-c9e4-afc1-ad2a1226970e@gmail.com> (raw)
In-Reply-To: <CAJZjrdUXoa8EXYfFzHqn2yrUdidwdPSoEJ8_AFwwAX3ORr59UQ@mail.gmail.com>



I'm on Meld 3.16.0, OSX 10.12.4, git 2.12.2 and haven't changed any git 
or meld code. Let me know when its fixed so I can turn hasOutput back 
on? Thanks and good luck.

On 5/16/17 9:05 PM, Samuel Lijin wrote:
> On Tue, May 16, 2017 at 5:55 PM, Matthew Groth <mgroth49@gmail.com> wrote:
>> I needed to use `git config mergetool.meld.hasOutput false`
>
> Hm, that's interesting - the source code snippet you quoted from meld
> implies it supports --output. What version of meld do you have?
>
> David Aguilar seems to be the one who's contributed most of the meld
> code, perhaps he might have an idea about why this is happening.
>

      reply	other threads:[~2017-05-17  4:28 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-16 21:55 [fixed] error using `git mergetool --tool=meld` Matthew Groth
2017-05-17  1:05 ` Samuel Lijin
2017-05-17  4:28   ` Matthew Groth [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=449621d5-c645-c9e4-afc1-ad2a1226970e@gmail.com \
    --to=mgroth49@gmail.com \
    --cc=davvid@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=sxlijin@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).