Merge pull request #24 from killarny/patch-1

Temporarily unset GIT_EXTERNAL_DIFF when invoking git diff.

cdiff.py

@@ -54,7 +54,7 @@ COLORS = {
 VCS_INFO = {
     'Git': {
         'probe' : ['git', 'rev-parse'],
-        'diff'  : ['git', 'diff'],
+        'diff'  : ['env', '-u', 'GIT_EXTERNAL_DIFF', 'git', 'diff'],
         'log'   : ['git', 'log', '--patch'],
     },
     'Mercurial': {