Allow git-mergetool to handle paths with a leading space