Andrew's git / gitweb.git / diff
?
Merge branch 'mk/combine-diff-context-horizon-fix'
authorJunio C Hamano <gitster@pobox.com>
Sun, 2 Jun 2013 22:56:46 +0000 (15:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 2 Jun 2013 22:56:46 +0000 (15:56 -0700)
"git diff -c -p" was not showing a deleted line from a hunk when
another hunk immediately begins where the earlier one ends.

* mk/combine-diff-context-horizon-fix:
combine-diff.c: Fix output when changes are exactly 3 lines apart

No differences found