Prettyprint octopus merge message.

diff --git a/Makefile b/Makefile
index f9ecbef6cbfa6a10d506e8551c7d23b525c205d4..8a1a06f36aa8756419ea5cf70c8d8701d29bda1e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,7 @@ SCRIPT_SH = \
 
 SCRIPT_PERL = \
        git-archimport.perl git-cvsimport.perl git-relink.perl \
-       git-rename.perl git-shortlog.perl
+       git-rename.perl git-shortlog.perl git-fmt-merge-msg.perl
 
 SCRIPT_PYTHON = \
        git-merge-recursive.py