Display conflicts to be resolved.

[Bela Babik]

Cool, thanks!

On 8/9/07, Brendan Cully <brendan at kublai.com> wrote:
> On Thursday, 09 August 2007 at 11:14, Bela Babik wrote:
> > http://www.selenic.com/mercurial/wiki/index.cgi/ImergeExtension states
> > that Imerge is distributed with Mercurial, but it is not included in
> > 0.9.4 (not even in the stable snapshot).
> >
> > It's confusing and there are no download link for the extension.
>
> You're right. It's in crew but hasn't propagated yet. In the mean
> time, it can be gotten here:
>
> http://hg.kublai.com/mercurial/crew/raw-file/tip/hgext/imerge.py
>
> I'll update the wiki.