Confusing message from "bzr resolve"

[Eli Zaretskii]

I did a "bzr merge", which announced a text conflict in a single file,
let's call it FOO.  I edited FOO to resolve the conflict, then typed

  bzr resolve FOO

and was presented with a message

  FOO is not conflicted

Is this message expected?  If it is, it's confusing: it may be
interpreted as an error message saying, in effect, that I tried to
resolve a conflict that didn't exist.

Or did I do something wrong while resolving the conflict?

TIA