Re-implement "check_file_directory_conflict()"

diff --git a/Makefile b/Makefile
index 8216c99035c11936d449d8fa436353faf495d146..bf63984bb96c3c1cf709179c4d823cd649842df8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,8 @@ INSTALL=install
 SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
        git-pull-script git-tag-script git-resolve-script git-whatchanged \
        git-deltafy-script git-fetch-script git-status-script git-commit-script \
-       git-log-script git-shortlog git-cvsimport-script
+       git-log-script git-shortlog git-cvsimport-script git-diff-script \
+       git-reset-script git-add-script
 
 PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
        git-read-tree git-commit-tree git-cat-file git-fsck-cache \