Fix mismerge at cdb22c4 in builtin-checkout.c
authorJunio C Hamano <gitster@pobox.com>
Sun, 19 Oct 2008 22:32:35 +0000 (15:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 19 Oct 2008 22:32:42 +0000 (15:32 -0700)
commit828e32b...2e3e2bb10d6d730d3abe505063b481f6
tree41aafda...561e699aaf2154024144eb7524c58547copy hash to clipboard (tree)
parente137a89...d88cc40d7c0df45c06c08d144f7b3ce2copy hash to clipboard (diff)
builtin-checkout.c