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)
commitedc7f0a...cbc42d05a5be1877ded9cc6eba5ec1b6
tree40bd9da...afb64753b3a6b6ad8a716f129eb72514copy hash to clipboard (tree)
parent911439a...aba362add6b672a09afd11706e05aed7copy hash to clipboard (diff)
parentaac3857...7a62bfa6889151d191e08b9725587912copy hash to clipboard (diff)
combine-diff.c
t/t4038-diff-combined.sh