Merge branch 'jc/maint-log-merge-left-right' into maint
commit925ca887b8ade2a5de6b50652008d0ee1fff3215
authorJunio C Hamano <gitster@pobox.com>
Sat, 8 Mar 2008 10:11:37 +0000 (8 02:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 8 Mar 2008 10:11:37 +0000 (8 02:11 -0800)
tree50a37487e54b065c4df14a2452aa155aa657b6ae
parentca2c19503cdd5a603024665bee8e9e8533431c9a
parente82447b1dfbda6ecfc101381c1295c444c73c903
Merge branch 'jc/maint-log-merge-left-right' into maint

* jc/maint-log-merge-left-right:
  Fix "git log --merge --left-right"