Clarification: is the hgmerge program always called?
Matt Mackall
mpm at selenic.com
Mon May 15 13:36:50 CDT 2006
On Mon, May 15, 2006 at 06:32:31PM +0200, Christian Boos wrote:
> Hi,
>
> While doing some updates in the Wiki (turning "hg update -m"
> into "hg merge"), I was a bit surprised by the explanations
> concerning the merge program: it was written that Mercurial
> tries to resolve the merge on its own, and only when it fails
> to do so, calls an external merge program...
There are some conflicts that it resolves internally, but these are at
the directory level, not the level of file contents.
--
Mathematics is the supreme nostalgia of our time.
More information about the Mercurial
mailing list