Merge branch 'jc/maint-split-diff-metainfo' into maint
commitcc91e1bd0537442339c4fd233b98a4b30e9dbe29
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 01:54:17 +0000 (5 17:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 01:54:17 +0000 (5 17:54 -0800)
treed9f41aadcb3c13bc24ffdc01c6a1187b88c54bf4
parent8abc61880d34f7a85928d7ca95cb1165b2aca1df
parent90b23e5f21e101f14da60375e4bda265a677e209
Merge branch 'jc/maint-split-diff-metainfo' into maint

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