Community Announcements have moved! To stay up to date, please join the new Community Announcements group today. Learn more
×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\"