If you want to use Xcode's FileMerge as your git mergetool, this is how you set it up.

gistfile1.sh

# Tell system when Xcode utilities live:
sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer

# Set "opendiff" as the default mergetool globally:
git config --global merge.tool opendiff

thank you. exactly what i was looking for

Fantastic, thank you!

👍

I also ran this, so after saving changes and exiting, git wouldn't ask "Was the merge successful? [y/n]?"

git config --global mergetool.opendiff.trustExitCode true

(Credit: https://stackoverflow.com/q/10656719/4810109)

👍

thank you 👍🏻

👍 Still useful 10 years on

😎 Thanks for this.

thanks