Here is an output of the saved process log
git\r\n-c diff.mnemonicprefix=false -c core.quotepath=false --no-optional-locks difftool -y --tool=sourcetree cdba7a26dc67689da83018e619c8195a58a6f4bf^..cdba7a26dc67689da83018e619c8195a58a6f4bf --\r\nmarktestfile
This does not work because of the inserted "\r\n" by source tree. If I run this command less the "\r\n" in the terminal it works, any thoughts? Thanks.
Hi Michael, thanks for the response,
If I take this command place it in a terminal and remove the "\r\n" then it launches beyond compare, but it will not launch if I don't do that. It does nothing.
Here is the .gitconfig file in my user folder:
name = xxxxxxx
email = xxxxxxx
helper = manager
recentrepo = 'C:/xxxxx/yyyyy'
cmd = 'C:/Program Files/Beyond Compare 4/BComp.exe' $LOCAL $REMOTE
cmd = 'C:/Program Files/Beyond Compare 4/BComp.exe' $BASE $LOCAL $REMOTE trustExitCode = true
tool = sourcetree
guitool = sourcetree
External diff (beyond compare, or anything else) doesn't work for me using 3.1.2 and HIgh Sierra. I am still debugging. Logging doesn't work either. It "used to work." In the task manager the error is
Unknown merge tool sourcetree
Which is odd since preferences/diff is correctly configured.
Issue reported against Windows, have yet to find someone see this with OSX:
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events