Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'
authorJunio C Hamano <gitster@pobox.com>
Sun, 31 Aug 2008 02:44:17 +0000 (19:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 31 Aug 2008 02:44:26 +0000 (19:44 -0700)
commit29a1f99...4b81cd28163de1275265234c5ab804b4
tree8179b07...40733b5e447b81117a9d82e651d8315ccopy hash to clipboard (tree)
parentc236bcd...6138bcbc929b86ad1a513635bf4847b2copy hash to clipboard (diff)
parent38901a4...375952ab6c02f22bddfa19ac2bec2c36copy hash to clipboard (diff)