Code

Merge branch 'jc/maint-split-diff-metainfo' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 01:54:17 +0000 (17:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 01:54:17 +0000 (17:54 -0800)
* jc/maint-split-diff-metainfo:
  diff.c: output correct index lines for a split diff


Trivial merge