summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 38f7054..7ef9861 100644
--- a/Makefile
+++ b/Makefile
@@ -73,7 +73,8 @@ SCRIPT_SH = \
git-repack.sh git-request-pull.sh git-reset.sh \
git-resolve.sh git-revert.sh git-sh-setup.sh git-status.sh \
git-tag.sh git-verify-tag.sh git-whatchanged.sh git.sh \
- git-applymbox.sh git-applypatch.sh
+ git-applymbox.sh git-applypatch.sh \
+ git-merge.sh git-merge-resolve.sh git-merge-octopus.sh
SCRIPT_PERL = \
git-archimport.perl git-cvsimport.perl git-relink.perl \