Code

Merge branch 'js/log-show-children'
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Oct 2011 04:59:12 +0000 (21:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Oct 2011 04:59:12 +0000 (21:59 -0700)
* js/log-show-children:
  log --children

1  2 
log-tree.c

diff --cc log-tree.c
Simple merge