[cvsnt] Merge Application

[Mitch Davis]

> -----Original Message-----
> From: Mitch Davis 
> 
> > What I am looking for is a merge application
> 
> The two tools I use are WinMerge and jEdit's jdiff mode.
> 
> You can get WinMerge here:
>
>   http://sourceforge.net/projects/winmerge/

[snip]

> For times when the files need hand-editing, I use
> the "JDiff" plugin for jEdit:
> 
>   http://plugins.jedit.org/plugins/?JDiffPlugin

[snip]

>   http://www.xemacs.org/

[snip]

> PS: If this was of use to you, would you consider
> putting it into the CVSNT wiki?

For what it's worth, I have updated the CVSNT Wiki
to reflect these tools:

  http://www.cvsnt.org/wiki/ThirdPartyTools

Everybody, please feel free to amend/hack/append to what I
wrote.

Mitch.

----------------------------------------------------------------------------
------------------------
The information contained in this message and any attachments is 
confidential and intended for the named recipient(s). If you have received
this message in error, please contact sender by return e-mail and 
destroy the message and any attachments. 
Any opinions or undertakings expressed in this message are those of the 
individual sender except where the sender expressly and with authority 
states them to be the opinions of Extel. 
----------------------------------------------------------------------------
------------------------