Merge branch 'jc/diff-test-updates' into th/diff
authorJunio C Hamano <junkio@cox.net>
Wed, 28 Jun 2006 11:02:46 +0000 (04:02 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 28 Jun 2006 11:02:46 +0000 (04:02 -0700)
* jc/diff-test-updates:
  t4013 test updates for new output code.


Trivial merge