]> git.ipfire.org Git - thirdparty/git.git/commit - t/t4038-diff-combined.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 911439a aac3857)
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)
commitedc7f0abcbc42d05a5be1877ded9cc6eba5ec1b6
tree40bd9da3afb64753b3a6b6ad8a716f129eb72514tree | snapshot
parent911439a5aba362add6b672a09afd11706e05aed7commit | diff
parentaac385717a62bfa6889151d191e08b9725587912commit | diff
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
combine-diff.c diff1 | diff2 | blob | history
t/t4038-diff-combined.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.