From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 Sep 2016 04:35:54 +0000 (-0700)
Subject: Merge branch 'jk/difftool-command-not-found' into maint
X-Git-Tag: v2.10.1~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bde42f081e68030505f59186ae036b2bbbd94ce8;p=thirdparty%2Fgit.git

Merge branch 'jk/difftool-command-not-found' into maint

"git difftool" by default ignores the error exit from the backend
commands it spawns, because often they signal that they found
differences by exiting with a non-zero status code just like "diff"
does; the exit status codes 126 and above however are special in
that they are used to signal that the command is not executable,
does not exist, or killed by a signal.  "git difftool" has been
taught to notice these exit status codes.

* jk/difftool-command-not-found:
  difftool: always honor fatal error exit codes
---

bde42f081e68030505f59186ae036b2bbbd94ce8