Stop assuming .git is a directory in gitmerge.el