Fix mismerge at cdb22c4 in builtin-checkout.c