vilasmaciel/diff.py

Last active August 29, 2015 14:11

Star () You must be signed in to star a gist
Fork () You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/vilasmaciel/b35e4f9bea33b02a1bc2.js"></script>
Save vilasmaciel/b35e4f9bea33b02a1bc2 to your computer and use it in GitHub Desktop.

Download ZIP

Meld diff script to use with git

Raw

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

Author

vilasmaciel commented Apr 21, 2015

sudo apt-get install meld
git config --global diff.external
git config --global diff.external <path_to_file>/diff.py

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment