X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Makefile;h=b15727391422083ec6012d0196e5afb0f36ff704;hb=f5cabd13d814bb5c547a13af03bcc42122531141;hp=92de1cb7928cf6368ea1f2054cc2000e30f78268;hpb=42d545e8ff33f478a4b7b99562ab073d8820b334;p=git.git

diff --git a/Makefile b/Makefile
index 92de1cb7..b1572739 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ CC=gcc
 
 PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
 	cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
-	check-files ls-tree
+	check-files ls-tree merge-tree
 
 all: $(PROG)
 
@@ -64,6 +64,9 @@ check-files: check-files.o read-cache.o
 ls-tree: ls-tree.o read-cache.o
 	$(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 
+merge-tree: merge-tree.o read-cache.o
+	$(CC) $(CFLAGS) -o merge-tree merge-tree.o read-cache.o $(LIBS)
+
 read-cache.o: cache.h
 show-diff.o: cache.h