X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Makefile;h=7a0ee780dc9c8d7129431ebeafb6805b4a4c9dd6;hb=694a577519a762d12b8a53e76b6f1dd3ccf25e7d;hp=cabde8177e1dd2ad03c558339f932b6959a9bce2;hpb=5d3d1cacc139194672a6a184509bb620a19b2497;p=git.git

diff --git a/Makefile b/Makefile
index cabde8177..7a0ee780d 100644
--- a/Makefile
+++ b/Makefile
@@ -221,7 +221,7 @@ SCRIPT_SH = \
 	git-sh-setup.sh \
 	git-am.sh \
 	git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
-	git-merge-resolve.sh git-merge-ours.sh \
+	git-merge-resolve.sh \
 	git-lost-found.sh git-quiltimport.sh git-submodule.sh \
 	git-filter-branch.sh \
 	git-stash.sh
@@ -353,6 +353,7 @@ BUILTIN_OBJS = \
 	builtin-mailsplit.o \
 	builtin-merge-base.o \
 	builtin-merge-file.o \
+	builtin-merge-ours.o \
 	builtin-mv.o \
 	builtin-name-rev.o \
 	builtin-pack-objects.o \