Last week I flew SIN-NRT and then NRT-ATL. When I got to the GE kiosk in ATL it asked me if I arrived on "<SIN-NRT flight number> NRT-ATL?"
I knew that was incorrect, and answered NO. Took my slip with the big X to the GE line CBP person and told him the flight number was wrong. He found me in the computer on the manifest and said OK. I asked him if it happened in the future, should I say Yes because the city pair was correct, or answer NO because the flight number was wrong.
He told me to answer NO in the future.