summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-07-01 16:11:16 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-07-01 16:17:29 -0700
commit6b445773b78544032262b897c9aa3b5bd4405dd3 (patch)
treed0f907c115a25e54c1a9b3ef50133184f9a10710 /contrib
parentMerge git://bogomips.org/git-svn into maint (diff)
downloadtgif-6b445773b78544032262b897c9aa3b5bd4405dd3.tar.xz
mergetool: check return value from read
The process may not even have the standard input open in which case it will get stuck in an infinite loop to prompt and read nothing. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions