From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 Oct 2014 17:09:35 +0000 (-0700)
Subject: Merge branch 'da/difftool'
X-Git-Tag: v2.2.0-rc0~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9ce57f12280eb6a95043e28ad68ff2b6c70c09ad

Merge branch 'da/difftool'

Allow diff tool backend to stop early by exiting with a non-zero
status.

* da/difftool:
difftool: add support for --trust-exit-code
difftool--helper: exit when reading a prompt answer fails
---

9ce57f12280eb6a95043e28ad68ff2b6c70c09ad