When I do `git diff` sometimes I get this:
...skipping...
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
...skipping...
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
...skipping...
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
it goes on like this for about 10 times the length. Looks like this
happens
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 <mgrot...@gmail.com> wro
I needed to use `git config mergetool.meld.hasOutput false`
I tried `git config mergetool.meld.hasOutput true` followed again by
`git mergetool --tool=meld` and got the same error.
My original message:
When using `git mergetool --tool=kdiff3`, it works fine. But
with `git mergetool --tool=meld` I get this for every merge conflict:
When using `git mergetool --tool=kdiff3`, it works fine. But with `git
mergetool --tool=meld` I get this for every merge conflict:
```
Normal merge conflict for 'builders/pdfBuilder.py':
{local}: created file
{remote}: created file
Traceback (most recent call last):
File
5 matches
Mail list logo