[PATCH 1 of 4] hgmerge: add new hgmerge package under mercurial

[Matt Mackall]

On Tue, 2008-01-08 at 12:14 -0600, Steve Borho wrote:
> > Browsable?
> 
> That's historical.  At one point I was considering a PyGtk app that
> would use DND and MIME to allow browsing of the two file versions.
> Obviously no longer applicable.  What's a better verb?  viewable?

"is"

> > > +def eoltype(name):
> > > +    ''' Get the EOL type for a file.
> > > +    '''
> > 
> > util.py
> > 
> > > +def lookup_reg(path):
> > > +    ''' Look up a path in the Windows registry.
> > > +    @return: The value for the path if found, else None.
> > > +    '''
> > 
> > util_win32.py
> 
> Thought so.
> 
> > > +# -*- coding: utf-8 -*-s
> > 
> > No thanks.
> 
> The ecmerge registry key has a non-ascii character in it.  Using utf-8
> was the easiest solution.  Is there a more generic work around for this?

\u or \x? There's no reason the source shouldn't be entirely ASCII,
modulo author names in comments.

-- 
Mathematics is the supreme nostalgia of our time.