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)
commitc2b9e6994d044b218e59abf6d19f7751c4aa13e3
tree191050855782f098c4ef4a24bcb673cda33f1902
parente04156a437e671a772187da789d6a736a8125eef
parente686eb9870d6b382f0760e3e859e93c8c2dfb31b
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.