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)
* js/fmt-merge-msg:
  Make git-fmt-merge-msg a builtin


Trivial merge