Re: [Gnu-arch-users] graphical merges

[Matthieu Moy]

Aaron Bentley <address@hidden> writes:

> Tom Lord wrote:
>
>>        Aaron:
>>        I've been giving some thought to merge lately.  Thinking about
>>        how to satisfy Linus, who wants a graphical three-way merge.
>>        So far, I've come up with this:

For those  (like me a few  minutes ago) who don't  know what three-way
merge is, here's an explanation

http://www.bitkeeper.com/Test.Merging.File.html

And the corresponding screenshot

http://bitmover.com/gifs/fm3new.gif

-- 
Matthieu