conflict file in *nix like systems

Peter Pis noelsunny at googlemail.com
Fri Nov 21 10:58:56 CST 2008


Hi,

I've got a problem. How mercurial recognize file in conflict? On Windows
with TortoiseHg there is file with extension ".conflict~" created for file
that has conflicts. But on Mac Os and Linux (Fedora) no such file is
created. So I'd like to ask what's the mechanism that mercurial uses for
finding out that files are in conflict.

Thanks and regards,
-Peter
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20081121/b3c28631/attachment.htm 


More information about the Mercurial mailing list