summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-09-16 20:19:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-09-26 16:39:45 (GMT)
commit6d9990a959c0168ab6dfe75236980f95ac512ce5 (patch)
treec57a65f019c9104414afeaffa6af931f4a20b951 /Documentation
parent3e8e691abe4e1cce73a8a2ef413dada0278e7b3b (diff)
downloadgit-6d9990a959c0168ab6dfe75236980f95ac512ce5.zip
git-6d9990a959c0168ab6dfe75236980f95ac512ce5.tar.gz
git-6d9990a959c0168ab6dfe75236980f95ac512ce5.tar.bz2
mergetool: no longer need to save standard input
Earlier code wanted to run merge_file and prompt_after_failed_merge both of which wanted to read from the standard input of the entire script inside a while loop, which read from a pipe, and in order to do so, it redirected the original standard input to another file descriptor. We no longer need to do so after the previous change. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions