Merge branch 'jc/checkout-m-twoway'
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 21:24:08 +0000 (13:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 21:24:08 +0000 (13:24 -0800)
commit1b048b1...7d6c183b69ad0914da127321c1e6b6a6
treede56d40...8232789d79a2b07e779f728ce34a2c2acopy hash to clipboard (tree)
parent3fabe99...6b478f92cecdec9012dcb8bda9e17d25copy hash to clipboard (diff)
parent5cd7fad...076880c48a27fd4e5e70844f127ceb99copy hash to clipboard (diff)