From: Matthew Groth <mgroth49@gmail.com>
Date: Tue, 16 May 2017 21:12:19 GMT
Subject: Re: error using `git mergetool --tool=meld`
Message-ID: <68c4da38-2f3a-1b46-c2e8-3fa1c1170e6d@gmail.com>


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:

         ```
         Normal merge conflict for 'builders/pdfBuilder.py':
           {local}: created file
           {remote}: created file
         Traceback (most recent call last):
           File "/usr/local/bin/meld", line 20, in <module>
             filename = arg.split('=')[1]
         IndexError: list index out of range
         builders/pdfBuilder.py seems unchanged.
         ```

         And the contents of /usr/local/bin/meld are:

         arglist = []
         for arg in sys.argv[1:]:
             if arg.startswith('--output'):
                 filename = arg.split('=')[1] ##### <<--------- line 20
                 newArg = '--output=' + fix_abspath(filename)
             elif arg.startswith('-'):
                 newArg = arg
             else:
                 newArg = fix_abspath(arg)
             arglist.append(newArg)

         I'm on OSX: 10.12.4

         git --version
         git version 2.12.2