From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 13 Mar 2009 03:01:28 +0000 (-0700)
Subject: Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into maint-1.6.0
X-Git-Tag: v1.6.2.1~1^2^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=de55390d36f30d5ef4be84eb9adba74f6903aa8e;p=git.git

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
---

de55390d36f30d5ef4be84eb9adba74f6903aa8e