conflict detection with 1.11.17 client and 1.11.21 server?

[Dylan Alex Simon]

Apologies if this has already been covered but I don't see any obvious note
about it.

If I do something which generates a conflict, and then immediately try to
commit, when using older servers or newer clients, I correctly get the "file
`' had a conflict and has not been modified" message.  However, when using an
older client on the newer server, I get just a warning "file `' seems to still
contain conflict indicators", as if it's not detecting the matching timestamps
correctly.

Are there any plans to fix this incompatibility with a newer server version,
or is this just an unfortunate byproduct of the other update changes?

:-Dylan