git-merge-one-file: resurrect leading path creation.