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.
Junio C Hamano committed
Apr 11, 2006 at 14:34 UTC
72c159f642a33255b76fff512f2a8c3aff9f5dca
No changes.