Merge branch 'jc/maint-log-merge-left-right' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 8 Mar 2008 10:11:37 +0000 (02:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 8 Mar 2008 10:11:37 +0000 (02:11 -0800)
commit925ca88...b8ade2a5de6b50652008d0ee1fff3215
tree50a3748...e54b065c4df14a2452aa155aa657b6aecopy hash to clipboard (tree)
parentca2c195...3cdd5a603024665bee8e9e8533431c9acopy hash to clipboard (diff)
parente82447b...dfbda6ecfc101381c1295c444c73c903copy hash to clipboard (diff)