[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] 3 way merge Vs standard merge
|
From: |
Matthieu Moy |
|
Subject: |
[Gnu-arch-users] 3 way merge Vs standard merge |
|
Date: |
Thu, 22 Apr 2004 20:00:53 +0200 |
|
User-agent: |
Gnus/5.1002 (Gnus v5.10.2) Emacs/21.2 (gnu/linux) |
Hi,
I've started an explanation about the differences between the normal
"star-merge" and the three way merge on the wiki:
http://wiki.gnuarch.org/moin.cgi/Tla_20Reference_2f_2d_2dthree_2dway
It'd be nice if you could complete/correct it, and discuss the
advantages of both methods. I'm not experienced enough to say which is
better in which situation ...
--
Matthieu
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnu-arch-users] 3 way merge Vs standard merge,
Matthieu Moy <=