From 1327004ff39d55d62adea671b317c3d4b31cd167 Mon Sep 17 00:00:00 2001
From: James Polley <jamezpolley@gmail.com>
Date: Mon, 13 Jun 2011 11:44:53 +1000
Subject: [PATCH] Use --no-ext-diff to prevent output being munged by user's
 diff drivers

---
 plugin/git.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin/git.vim b/plugin/git.vim
index bd0b053..8629fde 100644
--- a/plugin/git.vim
+++ b/plugin/git.vim
@@ -93,7 +93,7 @@ endfunction
 
 " Show diff.
 function! GitDiff(args)
-    let git_output = s:SystemGit('diff ' . a:args . ' -- ' . s:Expand('%'))
+    let git_output = s:SystemGit('diff --no-ext-diff' . a:args . ' -- ' . s:Expand('%'))
     if !strlen(git_output)
         echo "No output from git command"
         return
@@ -138,7 +138,7 @@ function! GitCommit(args)
 
     let args = a:args
 
-    if args !~ '\v\k@<!(-a|--all)>' && s:SystemGit('diff --cached --stat') =~ '^\(\s\|\n\)*$'
+    if args !~ '\v\k@<!(-a|--all)>' && s:SystemGit('diff --no-ext-diff --cached --stat') =~ '^\(\s\|\n\)*$'
         let args .= ' -a'
     endif