Re: [boost] [git] Mercurial?

Subject: Re: [boost] [git] Mercurial?
From: Julien Nitard (julien.nitard_at_[hidden])
Date: 2012-03-22 03:10:44

Hi,

> That's actually not true. DVCS tools are not magic and when there is a
> genuine conflict in SVN (the same region was editited in parallel by two
> developers) then you also get a conflict in Git and Mercurial.
>
Could you please confirm this ? I am not an expert on that, but it seems
that the diff algo in Git and Hg is completely different. For instance it
is able to detect that lines were moved rather than some lines deleted and
some (unrelated) lines inserted in the SVN way.

Regards,

Julien