| commit | 10a20b43c3d03ea1fab9095f96eda66086d3dcd2 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 Apr 2012 17:35:25 +0000 (26 10:35 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 Apr 2012 17:35:26 +0000 (26 10:35 -0700) | ||
| tree | 79461cf56448cbf12a214fb69ed1e566f0b4bf49 | treesnapshot (tar.gz zip) |
| parent | b4bd6bb356795ef817d44d65c16bba7f192ab29e | commitdiff |
| parent | e5e9b56528294e9455d22d1abb21ad32f098a1be | commitdiff |
Merge branch 'rs/combine-diff-zero-context-at-the-beginning' into maint
An age-old corner case bug in combine diff (only triggered with -U0
and the hunk at the beginning of the file needs to be shown) has been
fixed.
By René Scharfe
* rs/combine-diff-zero-context-at-the-beginning:
combine-diff: fix loop index underflow
An age-old corner case bug in combine diff (only triggered with -U0
and the hunk at the beginning of the file needs to be shown) has been
fixed.
By René Scharfe
* rs/combine-diff-zero-context-at-the-beginning:
combine-diff: fix loop index underflow
| combine-diff.c | diff1 | diff2 | blobhistory |