summaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
diff options
context:
space:
mode:
authorLibravatar Johannes Sixt <j6t@kdbg.org>2014-10-26 09:09:20 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-10-27 11:17:56 -0700
commit25098690a0151ba29ec1c728d783366c1899624d (patch)
treefaea285763dccc0e2aea44ecfc8ab9f1df3f8ad3 /Documentation/git-difftool.txt
parentMerge branch 'maint-2.0' into maint (diff)
downloadtgif-25098690a0151ba29ec1c728d783366c1899624d.tar.xz
difftool--helper: exit when reading a prompt answer fails
An attempt to quit difftool by hitting Ctrl-D (EOF) at its prompt does not quit it, but is treated as if 'yes' was answered to the prompt and all following prompts, which is contrary to the user's intent. Fix the error check. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-difftool.txt')
0 files changed, 0 insertions, 0 deletions