01-18-2013
The correct way to do this is to use file revision control. See
Revision control.
This User Gave Thanks to fpmurphy For This Post:
10 More Discussions You Might Find Interesting
1. UNIX for Dummies Questions & Answers
Aside from the normal Linux distros, OS X, and the BSDs, what other forms of UNIX are there? I want to try one on a very old 75mhz box I have. Thanks in advance. (3 Replies)
Discussion started by: AMDPwred
3 Replies
2. UNIX for Dummies Questions & Answers
Like Unix Sco for example , i know that unix is available for free, maybe some utilities cost money...What is special about Unix Sco??? (2 Replies)
Discussion started by: BAM
2 Replies
3. UNIX for Dummies Questions & Answers
With so many diffrent flavors out there, how is a person soposed to know what to go with? I'm not asking for specific discussion here in this forum, but I would like to see various pages and articles dicsussing the pluses and minuses of various unix/linux OS's. I have been searching various... (1 Reply)
Discussion started by: MorderKartoffel
1 Replies
4. UNIX Desktop Questions & Answers
:confused:
What are some of the most popular versions of Unix and why? (2 Replies)
Discussion started by: jpawlicki2
2 Replies
5. Cybersecurity
I want to maintain a repository to track versions of common daemons running on several platforms such as apache, ssh, mysql; so that i can asociate vulnerabilities for each version of sw, Does anyone know if there is a project about this requirement? I search for projects in sourceforge, freshmeat... (2 Replies)
Discussion started by: Nektar
2 Replies
6. UNIX for Dummies Questions & Answers
Hello
we are using java 1.2 in our shell / env
it is also set in the main JAVA_HOME env var ,
but we have also java 1.4 installed , now we need to use new application that uses only java1.4
is there any way to point this specific application to use java 1.4 without changing the global... (2 Replies)
Discussion started by: umen
2 Replies
7. UNIX for Dummies Questions & Answers
Hi all:
I was just wondering if someone could tell me what versions of UNIX are available to public? I'm aware of all the available distro's for Linux e.g. Debain, SuSe, RedHat, etc ... However you never really here much about UNIX distro's! Is UNIX BDS a common one in use?
Thanks
Oliver (4 Replies)
Discussion started by: oliver79
4 Replies
8. UNIX for Dummies Questions & Answers
I sent a private message to one of the administrators/moderators, but I thought I'd ask here publicly after some thought.
I'm getting into Unix on my Mac (BSD). I was just wondering what the differences are between versions of Unix -- I want to learn more about it, but would it be better to... (1 Reply)
Discussion started by: Straitsfan
1 Replies
9. UNIX for Advanced & Expert Users
Hi
I have two tab delimited file with different number of columns but same number of rows. I need to combine these two files in such a way that row 1 in file 2 comes adjacent to row 1 in file 1.
For example:
The content of file1:
field1 field2 field3
a1 a2 a3
b1 b2 b3... (2 Replies)
Discussion started by: mary271
2 Replies
10. Fedora
Hello, I am very new at this and would like to know how many versions of Unix there are and all of the different versions of unix. (3 Replies)
Discussion started by: rosanna azani
3 Replies
LEARN ABOUT DEBIAN
kdiff3
KDIFF3(1) General Commands Manual KDIFF3(1)
NAME
KDiff3 -- compares two or three input files or directories
SYNOPSIS
KDiff3 [QT options] [KDE options] [KDiff3 options] [File1/base] [File2] [File3]
DESCRIPTION
This manual page documents briefly the KDiff3 tool.
This manual page was written for the Debian distribution because the original program does not have a manual page. For comprehensive help,
please see khelpcenter help:/kdiff3.
KDiff3 is a program that
o compares or merges two or three text input files or directories
o shows the differences line by line and character by character
o provides an automatic merge-facility and
o an integrated editor for comfortable solving of merge-conflicts
o supports Unicode, UTF-8 and other codecs
o supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.)
o Printing of differences
o Manual alignment of lines
o Automatic merging of version control history ($Log$)
OPTIONS
This program follows the usual GNU command line syntax, with long options starting with two dashes (`-'). A summary of options is included
below. For a full summary of options, run KDiff3 --help.
-m, --merge
Merge the input.
-b, --base file
Explicit base file. For compatibility with certain tools.
-o, --output file
Output file. Implies -m. E.g.: -o newfile.txt
--out file
Output file, again. (For compatibility with certain tools.)
--auto No GUI if all conflicts are auto-solvable. (Needs -o file)
--qall Don't solve conflicts automatically. (For compatibility...)
-L1 alias
Visible name replacement for first file/base file.
-L2 alias
Visible name replacement for second file.
-L3 alias
Visible name replacement for third file.
-L, --fname alias
Visible name replacement. May by supplied for each input.
--cs string
Change a setting, e. g. --cs "AutoAdvance=1".
--confighelp
Show a list of all settings and their values.
--config file
Use a different settings file.
--author
Show author of program.
-v, --version
Show version of program.
--license
Show license of program.
AUTHOR
This manual page was written by Eike Sauer <eike@debian.org> for the Debian system (but may be used by others). Permission is granted to
copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 (or, at your option, any later
version published by the Free Software Foundation).
On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL.
KDIFF3(1)