From 2fbdd1317480d2f14756d94e41a8eb07442d4841 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sat, 16 Apr 2005 12:24:12 -0700 Subject: Remove "merge-tree.c" It's there in the history if somebody wants to resurrect it, but it seems to have been successfully superceded by the new and improved index-merge thing, where we do all merging entirely in the index. --- Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b157273914..92de1cb792 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 merge-tree + check-files ls-tree all: $(PROG) @@ -64,9 +64,6 @@ 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 -- cgit v1.2.3