Skip to content

Instantly share code, notes, and snippets.

@fedir

fedir/diff.py

Created November 26, 2013 16:15
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save fedir/7661179 to your computer and use it in GitHub Desktop.
Save fedir/7661179 to your computer and use it in GitHub Desktop.
Download ZIP
Meld as merging tool on Ubuntu // ref .: http://nathanhoad.net/how-to-meld-for-git-diffs-in-ubuntu-hardy
Raw
diff.py
#!/usr/bin/python
import sys
import os
os.system('meld "%s" "%s"' % (sys.argv[2], sys.argv[5]))
Raw
gitConfig.sh
git config --global diff.external /home/fedir/bin/diff.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment