#Merging with graphical diff tools
First things first
It's worth trying to just run
git difftool or
git mergetool as by default most Git installations will configure your OS's diff tool (Meld for Ubuntu, and FileMerge / Opendiff for OSX).
There are two ways of updating the merge tools that Git will use by default. The first is to copy the config straight into your
.gitconfig file (usually in your home folder). If you're not happy doing that you can use
git config, e.g.:
git config --global diff.tool diffmerge git config --global diffmerge.cmd "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\""