diff3ing

[James Cloos]

>>>>> "Matt" == Matt Mackall <mpm at selenic.com> writes:

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

I thought that I was working on a clone of the new tree, not the old.

It does have http://www.kernel.org/hg/linux-2.6 in hgrc.

Perhaps I'm bouncing between too many scms to keep track of each of
their histories.

Instead of a forest of bks, all of them different, I now have a
flourishing, polygenous forest.  :-/

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

Looking at it I see that it does try merge(1), then diff3(1) and only
then kdiff3/tkdiff.  I don't know why those failed, but the kdiff3
runs each merged w/o my intervention, so automatic merging should have
been enough....

-JimC
-- 
James H. Cloos, Jr. <cloos at jhcloos.com>