]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 81de16a aac3857)
Merge branch 'mk/combine-diff-context-horizon-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:37:55 +0000 (14:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:37:56 +0000 (14:37 -0700)
commita0bf40ddc94d8ec57c2422b29ba82f3450211300
tree830f20f92ef7463a1a0b539d36c9afb828237de4tree | snapshot
parent81de16a5d5d1efffb472eac9d2a7f373cdcd906bcommit | diff
parentaac385717a62bfa6889151d191e08b9725587912commit | diff
Merge branch 'mk/combine-diff-context-horizon-fix' into maint

* 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.