| commit | edc7f0abcbc42d05a5be1877ded9cc6eba5ec1b6 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 2 Jun 2013 22:56:46 +0000 (2 15:56 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 2 Jun 2013 22:56:46 +0000 (2 15:56 -0700) | ||
| tree | 40bd9da3afb64753b3a6b6ad8a716f129eb72514 | treesnapshot (tar.gz zip) |
| parent | 911439a5aba362add6b672a09afd11706e05aed7 | commitdiff |
| parent | aac385717a62bfa6889151d191e08b9725587912 | commitdiff |
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
"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
| combine-diff.c | diff1 | diff2 | blobhistory |
| t/t4038-diff-combined.sh | diff1 | diff2 | blobhistory |