From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 2 Jun 2013 22:56:46 +0000 (-0700)
Subject: Merge branch 'mk/combine-diff-context-horizon-fix'
X-Git-Tag: v1.8.4-rc0~231
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/edc7f0abcbc42d05a5be1877ded9cc6eba5ec1b6?hp=edc7f0abcbc42d05a5be1877ded9cc6eba5ec1b6

Merge branch 'mk/combine-diff-context-horizon-fix'

"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
---