[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Gnu-arch-users] graphical merges

From: Matthieu Moy
Subject: Re: [Gnu-arch-users] graphical merges
Date: Sat, 03 Apr 2004 23:53:06 +0200
User-agent: Gnus/5.1002 (Gnus v5.10.2) Emacs/21.2 (gnu/linux)

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

And the corresponding screenshot


reply via email to

[Prev in Thread] Current Thread [Next in Thread]