summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2015-05-20 09:07:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-20 20:13:42 (GMT)
commit719518f5cebba0fb4ed6caf6d92d683e858120f0 (patch)
tree39eaef2c921384d056b0549a6e0296cee73495af /mergetools
parent3d4a3ffe64162b45ae7c991fc60623ecb4678cfd (diff)
downloadgit-719518f5cebba0fb4ed6caf6d92d683e858120f0.zip
git-719518f5cebba0fb4ed6caf6d92d683e858120f0.tar.gz
git-719518f5cebba0fb4ed6caf6d92d683e858120f0.tar.bz2
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>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions