Merge branch 'jc/diff-test-updates' into th/diff
commitf3bc46821263cfc2ab41b561727da4592ae5ea3b
authorJunio C Hamano <junkio@cox.net>
Thu, 29 Jun 2006 19:09:22 +0000 (29 12:09 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 29 Jun 2006 19:09:22 +0000 (29 12:09 -0700)
tree2b92504a6a15f20ed14415da8f398c0ff3c328e7
parent26183e25d4bc2ae86eb5efcf076882dc257d1bb9
parent026625e78eaf8ea2ae960525c367b5e8f1629fd4
Merge branch 'jc/diff-test-updates' into th/diff

* jc/diff-test-updates:
  t4013: note improvements brought by the new output code.