Merge branch 'jc/maint-split-diff-metainfo'
authorJunio C Hamano <gitster@pobox.com>
Sun, 1 Feb 2009 02:07:42 +0000 (18:07 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 1 Feb 2009 02:07:42 +0000 (18:07 -0800)
* jc/maint-split-diff-metainfo:
  diff.c: output correct index lines for a split diff

1  2 
diff.c

diff --cc diff.c
Simple merge