From 6b4642d8c8e61b2f3d76c09e2357dc38ca869ab2 Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Thu, 15 Jun 2017 23:44:41 -0400
Subject: [PATCH] Fixes #96 - stops opening external diff if configured

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

diff --git a/src/git/git.ts b/src/git/git.ts
index 496e770..562731e 100644
--- a/src/git/git.ts
+++ b/src/git/git.ts
@@ -185,7 +185,7 @@ export class Git {
     }
 
     static diff(repoPath: string, fileName: string, sha1?: string, sha2?: string, encoding?: string) {
-        const params = [`diff`, `--diff-filter=M`, `-M`];
+        const params = [`diff`, `--diff-filter=M`, `-M`, `--no-ext-diff`];
         if (sha1) {
             params.push(sha1);
         }
@@ -197,7 +197,7 @@ export class Git {
     }
 
     static diff_nameStatus(repoPath: string, sha1?: string, sha2?: string) {
-        const params = [`diff`, `--name-status`, `-M`];
+        const params = [`diff`, `--name-status`, `-M`, `--no-ext-diff`];
         if (sha1) {
             params.push(sha1);
         }