Configure meld as git diff and merge tool

Configure meld as git diff and merge tool

# inspired from http://nathanhoad.net/how-to-meld-for-git-diffs-in-ubuntu-hardy
# and http://gitguru.com/2009/02/22/integrating-git-with-a-visual-merge-tool/

sudo apt-get install meld

# create a python script with the below content and name it diff.py


#!/usr/bin/python

import sys
import os

os.system('meld "%s" "%s"' % (sys.argv[2], sys.argv[5]))

git config --global diff.external /path/to/diff.py

git diff filename

# the latter command should pop you up the meld diff tool

# for using meld as a  merge tool run 

git mergetool

# after git merge has already ran and generated conflicts