Merge branch 'js/merge'

diff --git a/Makefile b/Makefile
index cd3026db8de4cb19d6adaba5a868d32323e32b7f..0f7595552d6b13c3dda425ab4240cfb75ca4bea7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -238,7 +238,6 @@ PROGRAMS = \
        git-convert-objects$X git-fetch-pack$X \
        git-hash-object$X git-index-pack$X git-local-fetch$X \
        git-fast-import$X \
-       git-merge-base$X \
        git-daemon$X \
        git-merge-index$X git-mktag$X git-mktree$X git-patch-id$X \
        git-peek-remote$X git-receive-pack$X \