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

Re: Kernel RPM question: What if...

Carwyn Edwards wrote:
Bill Rugolsky Jr. wrote:

It's also nice to have an interactive diff/merge tool.  Emacs has a mode,
or you can look at tkdiff,


or xxdiff,


Meld falls into this caregory too:


Also does directory and CVS diffs.

Another one is kdiff3


From the web page

    KDiff3 is a program that
    * compares or merges two or three text input files or directories,
    * shows the differences line by line and character by character (!),
    * provides an automatic merge-facility and
    * an integrated editor for comfortable solving of merge-conflicts,
    * supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.),
    * ...

jpo -- José Pedro Oliveira * mailto: jpo di uminho pt * http://gsd.di.uminho.pt/~jpo * * gpg fingerprint = F9B6 8D87 859D 1C94 48F0 84C0 9749 9EB5 91BD 851B *

Attachment: signature.asc
Description: OpenPGP digital signature

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