Merge branch 'jc/combine' into next
authorJunio C Hamano <junkio@cox.net>
Wed, 5 Apr 2006 19:25:03 +0000 (12:25 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 5 Apr 2006 19:25:03 +0000 (12:25 -0700)
* jc/combine:
  combine-diff: move the code to parse hunk-header into common library.


Trivial merge