git w/ diffmerge

.gitconfig

[user]
name = Logan Barnett
email = [email protected]
[color]
       status = auto
       branch = auto
       diff = auto
[mergetool "diffmerge"]
    cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge \
        --nosplash \
        --result="$PWD/$MERGED" \
        "$PWD/$REMOTE" \
        "$PWD/$BASE" \
 	"$PWD/$LOCAL" 
    keepBackup = false
    trustExitCode = false
[merge]
  tool = diffmerge