I noticed that when I change anything in tools > Options none of the gitconfig files are changed and it looks like SourceTree stores settings in a different file.
I've tried to find all gitconfig files and Total Commander gave me few: I've tried to change diff/merge tools to another one but error was the same. When I try to launch external diff tool by RMC -> External Diff in Process Viewer I see the following: provides an automatic merge-facility and an integrated editor for comfortable solving of merge-conflicts, supports Unicode, UTF-8 and other codecs, autodetection via byte-order-mark 'BOM' supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.
I use IntelliJ IDEA tool and set it as follows in Tools -> Options -> Diff -> External Diff/Merge section:Ĭmd = 'C:/Program Files/JetBrains/IntelliJ IDEA Community Edition 2019.1.3/bin/idea64.exe' diff $LOCAL $REMOTEĬmd = 'C:/Program Files/JetBrains/IntelliJ IDEA Community Edition 2019.1.3/bin/idea64.exe' merge $LOCAL $REMOTE $BASE $MERGED
I've tried everything that I could find, but it didn't help much. After update to 3.1.3 version of sourcetree I can't launch external diff/merge tool.
0 kommentar(er)
