tortoiseHG not asking for merge anymore

[FLORENT Philippe]

Hello,

I have setup a hg rep on a server

At first when I pushed changes to the repo, as I had conflict with modifications done by my collegue,

Tortoise was displaying a merge/diff window

But after a couple of push, it does not do that anymore

So my changes and the one of my college are never merged, but just added to revision history

Please help me out

thanks
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial/attachments/20150720/3d02159d/attachment.html>