Date: Mon, 29 Jan 2001 15:50:54 +0200 (IST)
From: Eli Zaretskii <eliz AT is DOT elta DOT co DOT il>
X-Sender: eliz AT is
To: Hans-Bernhard Broeker <broeker AT physik DOT rwth-aachen DOT de>
cc: djgpp-workers AT delorie DOT com
Subject: Re: djasm patch
In-Reply-To: <Pine.LNX.4.10.10101291347280.27309-100000@acp3bf>
Message-ID: <Pine.SUN.3.91.1010129155000.1660B-100000@is>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Reply-To: djgpp-workers AT delorie DOT com
Errors-To: nobody AT delorie DOT com
X-Mailing-List: djgpp-workers AT delorie DOT com
X-Unsubscribes-To: listserv AT delorie DOT com
Precedence: bulk


On Mon, 29 Jan 2001, Hans-Bernhard Broeker wrote:

> Hmm.... looks like it's time for you or someone else to do a 'threeway'
> diff or merge: your version, the current CVS version, and their common
> ancestor. Then a longish session with Emacs' 'emerge' package (the
> 'merge-files-with-ancestor' function).

It would be better to use the merge function of Ediff.  Emerge is not 
maintained for a very long time, so it probably suffers from lots of bit 
rot.