From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Nov 2014 18:16:54 +0000 (-0800)
Subject: Merge branch 'da/difftool'
X-Git-Tag: v2.2.0-rc3~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f78278beb9792368de7edbbb031c3a88e0038a1;p=thirdparty%2Fgit.git

Merge branch 'da/difftool'

Fix-up to a new feature in 'master'.

* da/difftool:
  difftool: honor --trust-exit-code for builtin tools
---

3f78278beb9792368de7edbbb031c3a88e0038a1