Merge branch 'jc/combine' into next
commitd6102b53c8fcbc45567e48e3db1d1cb8498b0b94
authorJunio C Hamano <junkio@cox.net>
Wed, 5 Apr 2006 19:25:03 +0000 (5 12:25 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 5 Apr 2006 19:25:03 +0000 (5 12:25 -0700)
tree3e4be72be6a29fed421ff0da235010226c3bcaa0
parentb4196cf70a5fcd659fe334e5c03a416383f41985
parentc1e335a43fb4c2f422b4d78693b2344114209632
Merge branch 'jc/combine' into next

* jc/combine:
  combine-diff: move the code to parse hunk-header into common library.