Hi Rowan,
this is what I would have expected.
I did the test again and it worked as you've described it, unless the
conflicting editings are done under the same username. I don't know if
this is a bug or feature, but shouldn't be a real problem.
Thanks for you help,
Steffen