From: Junio C Hamano <junkio@cox.net>
Date: Tue, 11 Apr 2006 21:34:59 +0000 (-0700)
Subject: Merge branch 'jc/combine' into next
X-Git-Tag: v1.3.0-rc4~17
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=72c159f642a33255b76fff512f2a8c3aff9f5dca;p=git.git

Merge branch 'jc/combine' into next

* jc/combine:
  combine-diff: fix hunks at the end (take #2).
  combine-diff: do not lose hunks with only deletion at end.
---

72c159f642a33255b76fff512f2a8c3aff9f5dca