Code

Merge branch 'jc/combine' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 11 Apr 2006 21:34:59 +0000 (14:34 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 11 Apr 2006 21:34:59 +0000 (14:34 -0700)
* jc/combine:
  combine-diff: fix hunks at the end (take #2).
  combine-diff: do not lose hunks with only deletion at end.

1  2 
combine-diff.c

diff --cc combine-diff.c
Simple merge