Fix some tab/space inconsistencies in git-mergetool.sh