On Wed, Nov 02, 2005 at 03:45:02AM +0100, Olivier Lefevre wrote: > >The function is in mercurial/localrepo.py:merge3(). > > OK. I'll havwe a look. What about the atomicity issue? It's in the BTS. Not a high priority - it only comes up when hgmerge isn't found. -- Mathematics is the supreme nostalgia of our time.