difftool/mergetool: add diffuse as merge and diff tool

[git.git] / git-add--interactive.perl

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 064d4c68d09508f17de1f579c86903b38ebf4859..def062a9e2cbc67b78522aa47151d47cd50f0f33 100755 (executable)
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -802,6 +802,10 @@ EOF
                || $ENV{VISUAL} || $ENV{EDITOR} || "vi";
        system('sh', '-c', $editor.' "$@"', $editor, $hunkfile);
 
+       if ($? != 0) {
+               return undef;
+       }
+
        open $fh, '<', $hunkfile
                or die "failed to open hunk edit file for reading: " . $!;
        my @newtext = grep { !/^#/ } <$fh>;