Merge branch 'jc/maint-combine-diff-pre-context'
commitbc9c3e0b932c5e14de749e07f5045197e7d6cd76
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Jun 2008 21:33:56 +0000 (22 14:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Jun 2008 21:33:56 +0000 (22 14:33 -0700)
tree93d428b5550b47104251ffbd4d73877b59a602f2
parent8bcff62baf7a17864620964c60d3a02d7c5b8d77
parentc86fbe5332abe6b951731940b9a8676ea90a434c
Merge branch 'jc/maint-combine-diff-pre-context'

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