X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=6c01dc29537a7926f1e57c4fe115334c4cdc036c;hb=28ffb8987af97e28accc707c724207fbd745b027;hp=be6101ab23054c0af581f6d5cddb5c246304c7b1;hpb=2fd955cc0b49de9e64b2f073ce76033975f0be24;p=git.git

diff --git a/Makefile b/Makefile
index be6101ab..6c01dc29 100644
--- a/Makefile
+++ b/Makefile
@@ -89,7 +89,7 @@ SCRIPT_SH = \
 	git-tag.sh git-verify-tag.sh git-whatchanged.sh git.sh \
 	git-applymbox.sh git-applypatch.sh git-am.sh \
 	git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
-	git-merge-resolve.sh git-grep.sh
+	git-merge-resolve.sh git-merge-ours.sh git-grep.sh
 
 SCRIPT_PERL = \
 	git-archimport.perl git-cvsimport.perl git-relink.perl \