| commit | 6d9990a959c0168ab6dfe75236980f95ac512ce5 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 16 Sep 2011 20:19:33 +0000 (16 13:19 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 26 Sep 2011 16:39:45 +0000 (26 09:39 -0700) | ||
| tree | c57a65f019c9104414afeaffa6af931f4a20b951 | treesnapshot (tar.gz zip) |
| parent | 3e8e691abe4e1cce73a8a2ef413dada0278e7b3b | commitdiff |
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>
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>
| git-mergetool.sh | diffblobblamehistory |