Merge branch 'js/fmt-patch' into next
authorJunio C Hamano <junkio@cox.net>
Sun, 7 May 2006 04:47:22 +0000 (21:47 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 7 May 2006 04:47:22 +0000 (21:47 -0700)
* js/fmt-patch:
  fmt-patch: understand old <his> notation
  t1300-repo-config: two new config parsing tests.
  Another config file parsing fix.


Trivial merge