What is the cmd to setup sourcetree with diffmerge for 3-way merges?
While browsing I found some hints on how to invoke a 3-way merge for diffmerge:
But nothing as simple as a command that should sit in sourcetree’s configuration and just works:
If anyone has this setup, can you share?
One Solution collect form web for “What is the cmd to setup sourcetree with diffmerge for 3-way merges?”
You’re looking for the
git config setting. If you’d like to apply this setting to all of your repositories, run:
git config --global merge.conflictstyle diff3