Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maint

diff --git a/git-mergetool.sh b/git-mergetool.sh
index d20581c15c5086b02411cab618cde0a9ff14e7ed..9f77e3a8bb0b1197f860912b6d0e56b40b607cb9 100755 (executable)
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -451,8 +451,6 @@ fi
 printf "Merging:\n"
 printf "%s\n" "$files"
 
-IFS='
-'
 rc=0
 for i in $files
 do