Merge branch 'jc/maint-combine-diff-pre-context' into maint
commit4ace4fc584f48d5b8df957c4462cf5c7c58ab100
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2008 18:20:01 +0000 (25 11:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2008 18:20:01 +0000 (25 11:20 -0700)
tree4d11d3923324e1b3760e208e5947523041f18f47
parent41cb0fc100c2e00e2978c91d7d0b8b51167c1243
parentc86fbe5332abe6b951731940b9a8676ea90a434c
Merge branch 'jc/maint-combine-diff-pre-context' into maint

* jc/maint-combine-diff-pre-context:
  diff -c/--cc: do not include uninteresting deletion before leading context
combine-diff.c