|
From: | Aaron Bentley |
Subject: | Re: [Gnu-arch-users] graphical merges |
Date: | Sat, 03 Apr 2004 17:00:50 -0500 |
User-agent: | Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.6b) Gecko/20031205 Thunderbird/0.4 |
Matthieu Moy wrote:
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
tla star-merge is another example of three-way merging. Aaron
[Prev in Thread] | Current Thread | [Next in Thread] |