Merge branch 'js/fmt-merge-msg'
authorJunio C Hamano <junkio@cox.net>
Wed, 5 Jul 2006 23:23:46 +0000 (16:23 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 5 Jul 2006 23:23:46 +0000 (16:23 -0700)
commitd87b90e47f7430455385edcf8506288b9a73d3b5
treedb4d3f737b6aec174121ecc663b208c0f7cff198
parentb5dd9d2027c1bd5758033c7baf6d087752b0263d
parent00449f992b629f7f7884fb2cf46ff411a2a4f381
Merge branch 'js/fmt-merge-msg'

* js/fmt-merge-msg:
  Make git-fmt-merge-msg a builtin