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)
commitbdf6442b482e488fd34b2d749316312e0ee25a5b
treeab61dfcc3a9eecbf4a55af9e2c48b696a40ef510
parented096c4a23476810831e12d2e9227403c21bd774
parent90b23e5f21e101f14da60375e4bda265a677e209
Merge branch 'jc/maint-split-diff-metainfo'

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