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

[Matt Mackall]

On Fri, 2008-04-04 at 03:00 +0300, Dov Feldstern wrote:
> >>>   def _findtool(ui, tool):
> >>> +    if tool in ("internal:fail", "internal:local", "internal:other"):
> >>> +        return tool
> >> Your indenting is inconsistent here.
> >>
> > 
> > Oops.. sorry.
> 
> This must have happened in the transfer to the email; it's OK in my repo. Is it 
> better this way?

Yes, queued for -stable.

-- 
Mathematics is the supreme nostalgia of our time.