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)
commitf252281102514d8d3cc15a3df5ae633619c93835
treebc3ecf56e7ede3cc47534620c5e851b20d7bbe16
parent2c0b4dfd5a2099bdbbdfad71c3193a25c9052f2d
parent9e76bab14e50c46c624ae35f13c527a7a1b1185d
Merge branch 'jc/diff-test-updates' into th/diff

* jc/diff-test-updates:
  t4013 test updates for new output code.