kdiff31
Tool for comparison and merge of files and folders
Usage
kdiff3 [-u,
--ignore]
[--query]
[--html]
[--abort]
[-m,
--merge]
[-b,
--base
file]
[-o,
--output
file]
[--out
file]
[--noauto]
[--auto]
[--L1
alias1]
[--L2
alias2]
[--L3
alias3]
[-L,
--fname
alias]
[--cs
string]
[--confighelp]
[--config
file]
[File1]
[File2]
[File3]
Overview
Compares two or three input files or folders.
Options
-
-u, --ignore -
Ignored. (User defined.)
-
--query -
Ignored. (User defined.)
-
--html -
Ignored. (User defined.)
-
--abort -
Ignored. (User defined.)
-
-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
-ofile)
-
--noauto -
Ignore --auto and always show GUI.
-
--L1 alias1 -
Visible name replacement for input file 1 (base).
-
--L2 alias2 -
Visible name replacement for input file 2.
-
--L3 alias3 -
Visible name replacement for input file 3.
-
-L, --fname alias -
Alternative visible name replacement. Supply this once for every input.
-
--cs string -
Override a config setting. Use once for every setting. e.g.:
--csAutoAdvance=1.
-
--confighelp -
Show list of config settings and current values.
-
--config file -
Use a different config file.
File1
file1 to open (base, if not specified via --base)
File2
file2 to open
File3
file3 to open
Releases
12 releases since Debian 3.1 (Sarge); the text changed 8 times.
--L1 since Debian 11 (Bullseye);
--L2 since Debian 11 (Bullseye);
--L3 since Debian 11 (Bullseye);
--abort since Debian 11 (Bullseye);
--config since Debian 10 (Buster);
--confighelp since Debian 10 (Buster);
--cs since Debian 10 (Buster);
--html since Debian 11 (Bullseye);
--ignore since Debian 11 (Bullseye);
--noauto since Debian 12 (Bookworm);
--query since Debian 11 (Bullseye);
-L since Debian 10 (Buster);
-u since Debian 11 (Bullseye).
--author until Debian 10 (Buster);
--license until Debian 10 (Buster);
--qall until Debian 11 (Bullseye);
--version until Debian 10 (Buster);
-L1 until Debian 10 (Buster);
-L2 until Debian 10 (Buster);
-L3 until Debian 10 (Buster);
-v until Debian 10 (Buster).