Merge branch 'jc/checkout-m-twoway'
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 00:06:22 +0000 (16:06 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 00:06:22 +0000 (16:06 -0800)
commit7f1068e...1e5840fca0787f0925e62148b2f873ed
treefc50947...7f1b4ac6816168596d0ab75c2a24ba21copy hash to clipboard (tree)
parent1d3a035...6d48bfa870b6ebe7c59f12b66e3a1b1ccopy hash to clipboard (diff)
parent335c6e4...3d862913846661638af6e184055f6db5copy hash to clipboard (diff)
builtin/checkout.c