* flow.c (init_propagate_block_info): Fix merge error
        in HAVE_conditional_execution code.

From-SVN: r33705