Merge branch 'jc/fmt-merge-msg-test'
authorJunio C Hamano <junkio@cox.net>
Wed, 5 Jul 2006 23:36:46 +0000 (16:36 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 5 Jul 2006 23:36:46 +0000 (16:36 -0700)
* jc/fmt-merge-msg-test:
  t6200: fmt-merge-msg test.


Trivial merge