Merge branch 'js/fmt-merge-msg'

diff --git a/git.c b/git.c
index ca8961f0732bacc4efdb3afe9abc2e829ff69ee5..256730112e56e19e5df70f2bef4e3efdb1a5e362 100644 (file)
--- a/git.c
+++ b/git.c
@@ -187,7 +187,8 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "mailinfo", cmd_mailinfo },
                { "stripspace", cmd_stripspace },
                { "update-index", cmd_update_index },
-               { "update-ref", cmd_update_ref }
+               { "update-ref", cmd_update_ref },
+               { "fmt-merge-msg", cmd_fmt_merge_msg }
        };
        int i;