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:

  • https://answers.atlassian.com/questions/156961/setting-up-custom-merge-tool-in-sourcetree
  • http://twobitlabs.com/2011/08/install-diffmerge-git-mac-os-x/

But nothing as simple as a command that should sit in sourcetree’s configuration and just works:
enter image description here

  • how to add dlls to bitbucket using sourcetree
  • git: why can I checkout to the commit I deleted?
  • Source Tree and Github not seeing all of my files
  • Ignoring already committed files in Sourcetree
  • Can SourceTree show diff side-by-side
  • Why is .git/hooks sometimes missing in cloned repos?
  • If anyone has this setup, can you share?

  • Command to switch branches in GIT
  • Drawing tidy graphs with shared parents and children
  • Git environment variables for use in executing Jenkins shell scripts
  • Change default project root - Heroku
  • What happens after a Git clone is “done.”?
  • Paging in GIT when adding untracked files
  • One Solution collect form web for “What is the cmd to setup sourcetree with diffmerge for 3-way merges?”

    You’re looking for the merge.conflictstyle git config setting. If you’d like to apply this setting to all of your repositories, run:

    git config --global merge.conflictstyle diff3
    Git Baby is a git and github fan, let's start git clone.