Can't hgmerge

Wed Nov 2 02:03:57 UTC 2005

On Wed, Nov 02, 2005 at 02:16:47AM +0100, Olivier Lefevre wrote:
> > Also, [hgmerge] will attempt to do a hands-free merge with a non-
> > interactive tool before launching the GUI tool.
> 
> It occurs to me that this part of hgmerge functionality could
> probably be pulled into hg.

Yes and no. Deciding what to do with files of different types is left
to the merge tool.

-- 
Mathematics is the supreme nostalgia of our time.