Permalink
Browse files

Ensure git does not use an external diff tool

  • Loading branch information...
luisggpina authored and mernst committed Jul 4, 2018
1 parent 34b8ade commit 6fd5208a9714a0d27571a0154313844d218fd792
Showing with 1 addition and 1 deletion.
  1. +1 −1 framework/core/Vcs/Git.pm
@@ -59,7 +59,7 @@ sub _diff_cmd {
@_ >= 3 or die $ARG_ERROR;
my ($self, $rev1, $rev2, $path) = @_;
$path = defined $path ? "-- $path $path" : "";
return "git --git-dir=$self->{repo} diff --binary ${rev1} ${rev2} $path";
return "git --git-dir=$self->{repo} diff --no-ext-diff --binary ${rev1} ${rev2} $path";
}
sub _rev_date_cmd {

0 comments on commit 6fd5208

Please sign in to comment.