Merge branch 'jc/logopt' into next
authorJunio C Hamano <junkio@cox.net>
Sat, 15 Apr 2006 10:24:54 +0000 (03:24 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 15 Apr 2006 10:24:54 +0000 (03:24 -0700)
* jc/logopt:
  Extract "log [diff options]" parser out.
  diff-tree: typefix.


Trivial merge