info-cvs
[Top][All Lists]
Advanced

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

RE: Strategy to merge an Rev A.a modification into Rev A, B, C .. . sour


From: Douglas Finkle
Subject: RE: Strategy to merge an Rev A.a modification into Rev A, B, C .. . sources
Date: Wed, 4 Sep 2002 14:29:11 -0400

> Of course, diffing "diff" output makes for an unreadable mess, so
> instead I run both diffs in two xterm windows with the same
> geometry, then flip back and forth between the windows a few
> times quickly, looking for the characters that flicker.  Our
> visual systems are very good at spotting movement :-)

Try using the ediff command within Emacs-- it's excellent for
this, as well as for doing manual file merges.  Each difference
is broken down such that it's color-coded, and can be copied
from one buffer to the other.  There's even a 3-way diff when
things get really nasty-- meta-x ediff-files3 (or buffers3).




reply via email to

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