| commit | 719518f5cebba0fb4ed6caf6d92d683e858120f0 | |
| author | David Aguilar <davvid@gmail.com> | |
| Wed, 20 May 2015 09:07:22 +0000 (20 02:07 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 20 May 2015 20:13:42 +0000 (20 13:13 -0700) | ||
| tree | 39eaef2c921384d056b0549a6e0296cee73495af | treesnapshot (tar.gz zip) |
| parent | 3d4a3ffe64162b45ae7c991fc60623ecb4678cfd | commitdiff |
mergetool--lib: set IFS for difftool and mergetool
git-sh-setup sets IFS but it is not used by git-difftool--helper.
Set IFS in git-mergetool--lib so that the mergetool scriptlets,
difftool, and mergetool do not need to do so.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-sh-setup sets IFS but it is not used by git-difftool--helper.
Set IFS in git-mergetool--lib so that the mergetool scriptlets,
difftool, and mergetool do not need to do so.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-mergetool--lib.sh | diffblobblamehistory | |
| git-mergetool.sh | diffblobblamehistory |