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

* jc/fmt-merge-msg-test:
  t6200: fmt-merge-msg test.