[PATCH 0 of 2] internal merge tool not working for merge-pattern in hgrc

[Dov Feldstern]

At 
http://www.selenic.com/mercurial/wiki/index.cgi/MergeToolConfiguration 
is an example showing that one can choose one of the internal merge 
tools based on a file pattern in the hgrc file. However, this does not 
work in practice: hg complains "couldn't find merge tool internal:fail 
specified for *". (Note that the internal merge tools work fine when set 
in the environment variable HGMERGE, for example.)

Patch 1 provides a test for this behavior.

Patch 2 provides a fix. I'm not sure that it's the best way to do it, 
but it does work...

Thanks!
Dov