Merge branch 'jc/combine' into next
commit72c159f642a33255b76fff512f2a8c3aff9f5dca
authorJunio C Hamano <junkio@cox.net>
Tue, 11 Apr 2006 21:34:59 +0000 (11 14:34 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 11 Apr 2006 21:34:59 +0000 (11 14:34 -0700)
tree6c27b0f000d16f39085c1041e28749b90f59ab8e
parent4da8cbc234177d6a8cf749d4ef60bd05ec843898
parent740659519e0b30bc6b64f00ba69825294c40db07
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.
combine-diff.c