diff options
| -rw-r--r-- | g-ed-it/gitAction.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g-ed-it/gitAction.py b/g-ed-it/gitAction.py index afcc954..bf4670d 100644 --- a/g-ed-it/gitAction.py +++ b/g-ed-it/gitAction.py @@ -51,10 +51,10 @@ class GitAction (object): def diff_head_index(self,launcher, fileUriMethod = None): if fileUriMethod : fileUri = fileUriMethod() - subprocess.call(["git-diff","--cached",os.path.basename(fileUri)],stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri)) + subprocess.call(["git-difftool","--tool=meld","--no-prompt","--cached",os.path.basename(fileUri)],stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri)) pass def diff_index_wt(self, launcher, fileUriMethod = None): if fileUriMethod : fileUri = fileUriMethod() - subprocess.call(["git-diff",os.path.basename(fileUri)],stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri)) + subprocess.call(["git-difftool","--tool=meld","--no-prompt",os.path.basename(fileUri)],stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri)) pass |