How does mercurial merge inside?

Question

There is an excellent article on quora on how git integrates: http://www.quora.com/Git-revision-control/How-does-git-merge-work

And I was wondering if such a thing exists for Mercurial.

I admit that my motivation for this is that Mercurial seems really stupid in auto-resolving conflicts, but without specific information about how merging mercury, I cannot make an argument for Git. (Also, maybe I'm crazy, and the method is the same, even though I cannot find information on how HG merges anywhere.)

I also heard that HG is super customizable, so if there is a tool to make the merge less dull, I would like to hear about it.

As an example of the stupidity of HG, it seems that several conflicts have been made with others empty, for example:

<<<<<<<< local
[some new code...]
========
>>>>>>>> other

EDIT: So, I'm also looking for a merge tool that can intelligently automatically resolve conflicts. For example, it should be able to resolve the above example, which is very easy to resolve.

Answer 1

Mercurial pretty much leaves merging with external programs. Cm.

https://www.mercurial-scm.org/wiki/MergeToolConfiguration

and

https://www.mercurial-scm.org/repo/hg/help/merge-tools

On the last page:

Mercurial uses these rules when deciding which merge tool to use:

• --tool , . , . .

• "HGMERGE", .

• , , , . .

• ui.merge , . , . , .

• - , .

• "hgmerge" , - .

• , , , "internal: merge".

8. .

. Mercurial , . - Mercurial . premerge . , .