Merge branch 'jc/diff-test' into th/diff
authorJunio C Hamano <junkio@cox.net>
Tue, 27 Jun 2006 18:05:02 +0000 (11:05 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 27 Jun 2006 18:05:02 +0000 (11:05 -0700)
* jc/diff-test:
  t4013: add more tests around -c and --cc
  t4013: add tests for diff/log family output options.


Trivial merge