[PATCH 1 of 5] add hgmerge subsystem

[Matt Mackall]

On Fri, 2008-02-01 at 11:16 -0600, Matt Mackall wrote:
> On Thu, 2008-01-31 at 22:56 -0600, Steve Borho wrote:
> > # HG changeset patch
> > # User Steve Borho <steve at borho.org>
> > # Date 1201840117 21600
> > # Node ID d97cd00ba47b21050f1c85ccd0e06bba36d80eee
> > # Parent  9f1e6ab76069641a5e3ff5b0831da0a3f83365cb
> > add hgmerge subsystem

I'm going to go ahead and take a stab at this.

-- 
Mathematics is the supreme nostalgia of our time.