nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

External diff command source-tree inserting \r\n in process Log and does not run

Mark McCain

Here is an output of the saved process log

git-c diff.mnemonicprefix=false -c core.quotepath=false --no-optional-locks difftool -y --tool=sourcetree cdba7a26dc67689da83018e619c8195a58a6f4bf^..cdba7a26dc67689da83018e619c8195a58a6f4bf --marktestfile

This does not work because of the inserted "" by source tree. If I run this command less the "" in the terminal it works, any thoughts? Thanks.

Accepted answers

All comments

minnsey

Hi
The carriage returns are just an artifact of the process viewer as far as I can see, I.e. I see the same in the process viewer but the external diff program opens.

What does the git config look like?

Mark McCain

Hi Michael, thanks for the response,

If I take this command place it in a terminal and remove the "" 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:

[user]

name = xxxxxxx

email = xxxxxxx

[credential]

helper = manager

[gui]

recentrepo = 'C:/xxxxx/yyyyy'

[difftool "sourcetree"]

cmd = 'C:/Program Files/Beyond Compare 4/BComp.exe' $LOCAL $REMOTE

[mergetool "sourcetree"]

cmd = 'C:/Program Files/Beyond Compare 4/BComp.exe' $BASE $LOCAL $REMOTE trustExitCode = true

[merge]

tool = sourcetree

[diff]

guitool = sourcetree

Terris Linenbach_lnifka

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:

https://jira.atlassian.com/browse/SRCTREEWIN-11120

minnsey

Hi @Terris Linenbach You should raise an issue against the macOS version at https://jira.atlassian.com/browse/SRCTREE