The reason there is no conflict is that the entries for rc/bin/termrc in the replica databases on sources and on your computer are identical. Only after termrc would change on sources a conflict would arise becase the local copy would not match the database entry of the last pull.
* Antonin Vecera ([EMAIL PROTECTED]) wrote: > There is no conflict. I copied it as you wrote. After that I had local > termrc with different time compared to termrc in sources. I did pull - > and no changes, no conflicts. I don't understand. I expected conflict > because of different modification time. > > Antonin
