From: Junio C Hamano <junkio@cox.net>
Date: Sun, 7 May 2006 04:47:22 +0000 (-0700)
Subject: Merge branch 'js/fmt-patch' into next
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=c2b9e6994d044b218e59abf6d19f7751c4aa13e3;p=git.git

Merge branch 'js/fmt-patch' into next

* js/fmt-patch:
  fmt-patch: understand old <his> notation
  t1300-repo-config: two new config parsing tests.
  Another config file parsing fix.
---

c2b9e6994d044b218e59abf6d19f7751c4aa13e3