Launch External Merge Tool For Sourcetree Mac

Sublime Text version number: Dev channel, Build 3139

Git version number: 2.13.0 (Apple Git-88)

OS type and version: macOS Sierra, 10.12.5

Console error output:

A description of the problem:
On attempting to launch an external merge tool to resolve a conflict, nothing happens.
Inspecting the console shows this -

Relevant section of my gitconfig file:

Output of git config merge.tool is diffmerge.

Output of git config mergetool.diffmerge.cmd is - diffmerge --merge --result='$MERGED' '$LOCAL' '$BASE' '$REMOTE'

Steps to reproduce, if possible: I'm not entirely sure, I switched back to using my older Mac after encountering this issue on my current one. Very similar setup with just a difference in hardware (2015 vs 2013).

Hi @oddysee , thank you for reporting the issue! Kindly help us with a few more details:

• Output of git config -l | grep merge

• Result of running git mergetool on it's own in a shell

• If the above still doesn't provide enough information, please record and attach a debug log like so:

  1. Open sublime, and get to the state of conflict just prior to running the merge command
  2. Open command palette, and run the command 'GitSavvy: enable logging'
  3. Perform the failing 'Launch external merge tool' command.
  4. Run the command 'GitSavvy: disable logging'
  5. Run the command 'GitSavvy: view recorded log', save the file and attach it here. Take care to remove any sensitive information that may be recorded in GitSavvy.

I am seeing the same issue on one of my machines but not another. I do have a different mergetool than the OP. Here is the info you asked for:

• **Output of git config -l | grep merge:

• Result of git mergetool: Mergetool correctly opens up and works as expected.
• Result of GitSavvy debug log attached. gitsavvy-log.txt

As noted, running git mergetool works just fine, so it's not a major issue; but I can't figure out why one of my machines works and another doesn't when I hit M from the status screen to run the mergetool. Both machines have the same config. Any help would be appreciated.

Thank you for all your work on GitSaavy... it's a great tool that I use every day and sure appreciate it!!

Result of GitSavvy debug log attached.

Where is it?

Where is it?

Sorry, not sure what happened. I updated the comment with the attached log.

@theiviaxx
Can you inspect the console and see if it prints an error? maybe there is a problem with the path

@thezimmee are you sure that the issue occurred in the attached log? There doesn't seem that there is --verbose anywhere in the merge command to be executed.

If you still have the issue, I have created a branch that adds a bit more logging about executed command over here: feature/add-process-debug-log

Please try it out and add the new output here.

@asfaltboy OP here, I discovered that a botched install of a Git client (SourceTree) had mangled the gitconfig, which was resulting in the --verbose merge tool command.

Apologies for the confusion and thanks for all the assistance. Leaving this open for @thezimmee, though I'd suggest his issue is different and he'd be better off opening a separate issue.

I recently installed the dev build of Sublime, and for whatever reason that seemed to resolve the issue for me. Thanks for your help guys, I will let you know if I see it again.