* [fixed] error using `git mergetool --tool=meld`
@ 2017-05-16 21:55 Matthew Groth
2017-05-17 1:05 ` Samuel Lijin
0 siblings, 1 reply; 3+ messages in thread
From: Matthew Groth @ 2017-05-16 21:55 UTC (permalink / raw)
To: git
I needed to use `git config mergetool.meld.hasOutput false`
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [fixed] error using `git mergetool --tool=meld`
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
0 siblings, 1 reply; 3+ messages in thread
From: Samuel Lijin @ 2017-05-17 1:05 UTC (permalink / raw)
To: Matthew Groth, davvid; +Cc: git
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [fixed] error using `git mergetool --tool=meld`
2017-05-17 1:05 ` Samuel Lijin
@ 2017-05-17 4:28 ` Matthew Groth
0 siblings, 0 replies; 3+ messages in thread
From: Matthew Groth @ 2017-05-17 4:28 UTC (permalink / raw)
To: Samuel Lijin, davvid; +Cc: git
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.
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-05-17 4:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.