add param for git "--no-ext-diff" the absence of this param leads to …

…problems if the git is configered to use external merge tool
Mortal · Nov 29, 2010 · fe8742b · fe8742b
1 parent c32b7ee
commit fe8742b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/scmdiff.vim b/scmdiff.vim
@@ -76,7 +76,7 @@ function! s:detectSCM()
     let my_path = g:scmBufPath
     while my_path != "/"
         if !exists("g:scmDiffCommand") && isdirectory(my_path."/.git")
-            let g:scmDiffCommand = "git diff"
+            let g:scmDiffCommand = "git diff --no-ext-diff"
             return
         endif
         if !exists("g:scmDiffCommand") && isdirectory(my_path."/.hg")