Merge branch 'jc/checkout-m-twoway' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 19:44:54 +0000 (11:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 19:44:54 +0000 (11:44 -0800)
commit9b0b0b4...45bc3d2f12391fe0dd4eaef81db97295
tree43c1df0...83346ce7df327f8cff1c1c2bccdbd88bcopy hash to clipboard (tree)
parent00754b2...f931e0e85fe12e59111cf250d51d288bcopy hash to clipboard (diff)
parent5cd7fad...076880c48a27fd4e5e70844f127ceb99copy hash to clipboard (diff)
builtin/checkout.c