diff3ing

[Matt Mackall]

On Wed, Jul 20, 2005 at 02:21:24PM -0400, James Cloos wrote:
> I did a pull and update on my clone of linux-2.6.  The pull said I was
> pulling an unrelated source.  Then the update failed, indicating that
> I'd need to update -m.

You actually should have undone the pull. It wasn't lying about the
unrelated source.

What happened is the old repo got corrupted by changes to git and I
rebuilt it.

> The constant flashing of kdiff3 windows for each file was intolerable.
> It made is impossible to do anything in X.

The hgmerge script ought to try running merge3 before kdiff3. Perhaps
someone broke that.

-- 
Mathematics is the supreme nostalgia of our time.