Code

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)
commita959e0dc16907c4dc123cfac7bd22c636064a638
treef5133e66da4c79ebbecb011f61cfb734a4bae23d
parent3223847a8fbd6200e38f4a8f1146ca9dc20a813e
parent47979d5d5bb86d058dce77801648734abe1e593b
Merge branch 'jc/diff-test' into th/diff

* jc/diff-test:
  t4013: add more tests around -c and --cc
  t4013: add tests for diff/log family output options.