From: Junio C Hamano <junkio@cox.net>
Date: Tue, 6 Dec 2005 08:07:58 +0000 (-0800)
Subject: git-merge-one-file: resurrect leading path creation.
X-Git-Tag: v0.99.9m^2~55
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/be61db922a230ae2638c27c071ee4b8c98f01f72?hp=be61db922a230ae2638c27c071ee4b8c98f01f72

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

Since we do not use git-update-index followed by
git-checkout-index -u to create the half-merged file on
conflicting case anymore, we need to make sure the leading
directories are created here.

Maybe a better solution would be to allow update-index to add to
higher stage, and checkout-index to extract from such, but that
is a change slightly bigger than I would like to have so close
to 1.0, so this should do for now.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---