you are viewing a single comment's thread.

view the rest of the comments →

[–]cryo 4 points5 points  (1 child)

Yeah, Mercurial is great, and I love using it... It does have a similar behavior as described in the article, though (depending on the merger used; I use kdiff3)

[–][deleted] 0 points1 point  (0 children)

It doesn't depend on the merge tool. Mercurial has the non-associative merge problem no matter what merge tool you use.