Brian mofosyne

## 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
	# 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