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

  • Retrieve deleted stash in Git using SourceTree
  • Cant commit after starting a merge in Sourcetree
  • What does it mean when it says a git step is “1 ahead”
  • What happens to local code when we try to switch the branch in the sourcetree?
  • GIT picking up whitespace changes it shouldn't
  • How to get a list of pull requests between 2 commits
  • If anyone has this setup, can you share?

  • How can you block git commits from invalid users?
  • Prompt for password but not username?
  • How do you ensure that a commit is never deleted?
  • running git reset --hard manually
  • git fsck reporting “sha1 mismatch”
  • Git Installation is failing on Jenkins
  • 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.