git-mergetool: properly handle "git mergetool -- filename"