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)
commita0bf40d...c94d8ec57c2422b29ba82f3450211300
tree830f20f...2ef7463a1a0b539d36c9afb828237de4copy hash to clipboard (tree)
parent81de16a...d5d1efffb472eac9d2a7f373cdcd906bcopy hash to clipboard (diff)
parentaac3857...7a62bfa6889151d191e08b9725587912copy hash to clipboard (diff)
combine-diff.c
t/t4038-diff-combined.sh