Hi Song, On Wed, 2 May 2018 04:40:20 +0000 Song Liu <songliubrav...@fb.com> wrote: > > > - CHECK(build_id_matches < 1, "build id match", > > - "Didn't find expected build ID from the map\n"); > > + if (CHECK(build_id_matches < 1, "build id match", > > - "Didn't find expected build ID from the map")) > > ++ "Didn't find expected build ID from the map\n")) > > ^^^ Is there a "+" at the beginning of this line?
No, this is a merge resolution diff, so the ++ means that the line did not appear in either parent commit. -- Cheers, Stephen Rothwell
pgp_CHLS6CA2o.pgp
Description: OpenPGP digital signature
