Position of merge/diff in en/decode chain

Matt Mackall mpm at selenic.com
Tue Apr 20 13:52:28 CDT 2010


On Tue, 2010-04-20 at 12:03 +0200, Hans-Peter Oeri wrote:
> Hi!
> 
> On 04/19/2010 06:14 PM, Matt Mackall wrote:
> > The one exception to this rule is file merge, which is generally
> > performed by an external tool directly on the file in the working
> > directory. Thus, the premerge code also works on files in the working
> > directory form for consistency.
> >   
> So this is the only "dogma breach"? If no one considers this worth it, I
> might try to learn python to find a solution myself ;)

I bet you'll find this surprisingly easy. Countless Mercurial
contributors have gotten their first introduction to Python this way.

-- 
http://selenic.com : development and support for Mercurial and Linux




More information about the Mercurial mailing list