Merge branch 'jc/maint-log-merge-left-right'
authorJunio C Hamano <gitster@pobox.com>
Sun, 2 Mar 2008 23:12:04 +0000 (15:12 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 2 Mar 2008 23:12:04 +0000 (15:12 -0800)
* jc/maint-log-merge-left-right:
  Fix "git log --merge --left-right"

1  2 
revision.c

diff --cc revision.c
Simple merge