From: poinot at onera.fr (Marc Poinot)
Date: Wed, 14 Apr 1999 12:02:52 GMT
Subject: Tools for three way merge of Python source files?
References: <Pine.SGI.3.95q.990413125514.14593X-100000@masox202.msd.ray.com>
Message-ID: <371483EC.24A9AE3@onera.fr>
X-UID: 1150                                                  

"Milton L. Hankins" wrote:
> 
> Keywords: diff3, merge, three-way, 3-way
> 
You can use the GNU Emacs merge tool.
You will have a color presentation with some nice facilities.
Emacs can translate tabs to white-spaces and reverse and back
(untabify).
http://www.fsf.org

You can also use CVS to store your files
and ask it to merge them when you have several
branches of development.
http://www.cyclic.com

Marcvs [alias Emacs also have an undo, if to want to get back to the
reverse
        of your translation]




