checkout_merged(): squelch false warning from some gcc