![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Fri, 2 Dec 2005 01:02:04 +0000 (17:02 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Fri, 2 Dec 2005 01:02:04 +0000 (17:02 -0800) | ||
| commit | ce3ca275452cf069eb6451d6f5b0f424a6f046aa | |
| tree | f731b7b32038ae81e72f20ea65c22f4c1b2f65dd | tree | snapshot |
| parent | c639a5548a5d8414b55202592885449f66ee2f33 | commit | diff |
git-merge-one-file: do not worry about 'rmdir -p' not removing directory.
9ae2172aed289f2706a0e88288909fa47eddd7e7 used "rmdir -p"
carelessly, causing the more important "git-update-index
--remove" to be skipped.
Signed-off-by: Junio C Hamano <junkio@cox.net>
9ae2172aed289f2706a0e88288909fa47eddd7e7 used "rmdir -p"
carelessly, causing the more important "git-update-index
--remove" to be skipped.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-merge-one-file.sh | diff | blob | history |