This is an excerpt from the .gitconfig file SourceTree 4.02 (236) keeps changing to the wrong path. Every time I have to resolve conflicts I have to go into this file and change the paths. SourceTree keeps adding the path AGAIN to the end as highlighted. This has been going on for ages and was wondering if this is going to ever get fixed.
cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge/Contents/MacOS/DiffMerge --nosplash \"$LOCAL\" \"$REMOTE\" path = [mergetool "sourcetree"] cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge/Contents/MacOS/DiffMerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
Online forums and learning are now in one easy-to-use experience.
By continuing, you accept the updated Community Terms of Use and acknowledge the Privacy Policy. Your public name, photo, and achievements may be publicly visible and available in search engines.