Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into maint-1.6.0
commitde55390d36f30d5ef4be84eb9adba74f6903aa8e
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 Mar 2009 03:01:28 +0000 (12 20:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Mar 2009 03:01:28 +0000 (12 20:01 -0700)
tree979de479c424528e978590782ae75857fe7edc99
parenteb006ccfca019b4e96210310d9f823d050127b22
parentb67b9612e1a90ae093445abeaeff930e9f4cf936
Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into maint-1.6.0

* jc/maint-1.6.0-split-diff-metainfo:
  diff.c: output correct index lines for a split diff