Clarification: is the hgmerge program always called?

[Vadim Gelfer]

On 5/16/06, Christian Boos <cboos at neuf.fr> wrote:

> Besides, there's the "history sensitive" merge extension Vadim wrote
> some times ago. Is that still available?

i worked on it in past few days. i will put bundle up somewhere soon
when new drop is ready. code now includes demo command so you can
compare histmerge extension with regular merge output. also caches
results, so is faster than it was.

> And if you would use it, how should it be used (tell 'hgmerge' about it,
> or localrepository.merge3 should be modified so that it can call a
> merge hook?)

for now tell hgmerge.