From: Junio C Hamano <junkio@cox.net>
Date: Wed, 5 Apr 2006 19:25:03 +0000 (-0700)
Subject: Merge branch 'jc/combine' into next
X-Git-Tag: v1.3.0-rc4~39
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=d6102b53c8fcbc45567e48e3db1d1cb8498b0b94;p=git.git

Merge branch 'jc/combine' into next

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

d6102b53c8fcbc45567e48e3db1d1cb8498b0b94