conflict file in *nix like systems

[Isaac Jurado]

On Fri, Nov 21, 2008 at 5:58 PM, Peter Pis <noelsunny at googlemail.com> wrote:
>
> 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.

As of 1.0.2, conflicts should be resolved at merge time.  That is, each
time a conflict is found, a resolution tool (depending on your
configuration) pops up for each conflicting file.

This will change in next release, as new commands have been introduced
(in the development version) mimicking SVN conflict resolution.

Someone correct me if I'm wrong.

-- 
Isaac Jurado Peinado
http://www.krenel.net

"The noblest pleasure is the joy of understanding"
Leonardo da Vinci