Merge branch 'jc/maint-combine-diff-pre-context' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2008 18:20:01 +0000 (11:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2008 18:20:01 +0000 (11:20 -0700)
commit4ace4fc...84f48d5b8df957c4462cf5c7c58ab100
tree4d11d39...3324e1b3760e208e5947523041f18f47copy hash to clipboard (tree)
parent41cb0fc...00c2e00e2978c91d7d0b8b51167c1243copy hash to clipboard (diff)
parentc86fbe5...32abe6b951731940b9a8676ea90a434ccopy hash to clipboard (diff)
combine-diff.c