Merge branch 'rs/combine-diff-zero-context-at-the-beginning' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2012 17:35:25 +0000 (10:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2012 17:35:26 +0000 (10:35 -0700)
commit10a20b4...c3d03ea1fab9095f96eda66086d3dcd2
tree79461cf...6448cbf12a214fb69ed1e566f0b4bf49copy hash to clipboard (tree)
parentb4bd6bb...56795ef817d44d65c16bba7f192ab29ecopy hash to clipboard (diff)
parente5e9b56...28294e9455d22d1abb21ad32f098a1becopy hash to clipboard (diff)
combine-diff.c