Re: merge/diff GUI tool

[Christian Brechbuehler]

Excerpt of message (sent 28 November 2000) by Howard Zhou:
> I am wondering if there is any GUI based diff/merge tool in the public
> domain, which can work with CVS?

(x)emacs: M-x ediff-revision

(and sometimes other commands from the ediff family, like
ediff-merge-with-ancestor come in handy) In contrast to other tools
I've seen it narrows down the difference to words.  You can also do a
wordwise ediff!  The Gui is pretty decent, with colorful marking of
the difference regions.

  Christian Brechbühler