joachim99@56: .\" $Header$
joachim99@56: .\"
joachim99@56: .\"	transcript compatibility for postscript use.
joachim99@56: .\"
joachim99@56: .\"	synopsis:  .P! <file.ps>
joachim99@56: .\"
joachim99@56: .de P!
joachim99@56: .fl
joachim99@56: \!!1 setgray
joachim99@56: .fl
joachim99@56: \\&.\"
joachim99@56: .fl
joachim99@56: \!!0 setgray
joachim99@56: .fl			\" force out current output buffer
joachim99@56: \!!save /psv exch def currentpoint translate 0 0 moveto
joachim99@56: \!!/showpage{}def
joachim99@56: .fl			\" prolog
joachim99@56: .sy sed -e 's/^/!/' \\$1\" bring in postscript file
joachim99@56: \!!psv restore
joachim99@56: .
joachim99@56: .de pF
joachim99@56: .ie     \\*(f1 .ds f1 \\n(.f
joachim99@56: .el .ie \\*(f2 .ds f2 \\n(.f
joachim99@56: .el .ie \\*(f3 .ds f3 \\n(.f
joachim99@56: .el .ie \\*(f4 .ds f4 \\n(.f
joachim99@56: .el .tm ? font overflow
joachim99@56: .ft \\$1
joachim99@56: ..
joachim99@56: .de fP
joachim99@56: .ie     !\\*(f4 \{\
joachim99@56: .	ft \\*(f4
joachim99@56: .	ds f4\"
joachim99@56: '	br \}
joachim99@56: .el .ie !\\*(f3 \{\
joachim99@56: .	ft \\*(f3
joachim99@56: .	ds f3\"
joachim99@56: '	br \}
joachim99@56: .el .ie !\\*(f2 \{\
joachim99@56: .	ft \\*(f2
joachim99@56: .	ds f2\"
joachim99@56: '	br \}
joachim99@56: .el .ie !\\*(f1 \{\
joachim99@56: .	ft \\*(f1
joachim99@56: .	ds f1\"
joachim99@56: '	br \}
joachim99@56: .el .tm ? font underflow
joachim99@56: ..
joachim99@56: .ds f1\"
joachim99@56: .ds f2\"
joachim99@56: .ds f3\"
joachim99@56: .ds f4\"
joachim99@56: '\" t 
joachim99@56: .ta 8n 16n 24n 32n 40n 48n 56n 64n 72n  
joachim99@56: .TH "KDIFF3" "1" 
joachim99@56: .SH "NAME" 
joachim99@56: kdiff3 \(em compares two or three input files or directories 
joachim99@56: .SH "SYNOPSIS" 
joachim99@56: .PP 
joachim99@56: \fBkdiff3\fR [\fBQT options\fP]  [\fBKDE options\fP]  [\fBkdiff3 options\fP]  [\fB\fIFile1\fR\fP]  [\fB\fIFile2\fR\fP]  [\fB\fIFile3\fR\fP]  
joachim99@56: .SH "DESCRIPTION" 
joachim99@56: .PP 
joachim99@56: This manual page documents briefly the 
joachim99@56: \fBkdiff3\fR tool. 
joachim99@56: .PP 
joachim99@56: This manual page was written for the \fBDebian\fP distribution 
joachim99@56: because the original program does not have a manual page. 
joachim99@56: For comprehensive help, please see \fBkhelpcenter help:/kdiff3\fR. 
joachim99@56:  
joachim99@56: .PP 
joachim99@56: \fBkdiff3\fR is a program that 
joachim99@56:  
joachim99@56: .IP "   \(bu" 6 
joachim99@56: compares two or three input files  
joachim99@56: .IP "   \(bu" 6 
joachim99@56: shows the differences line by line and character by character  
joachim99@56: .IP "   \(bu" 6 
joachim99@56: provides an automatic merge-facility and  
joachim99@56: .IP "   \(bu" 6 
joachim99@56: an integrated editor for comfortable solving of merge-conflicts  
joachim99@56: .IP "   \(bu" 6 
joachim99@56: and has an intuitive graphical user interface  
joachim99@56: .IP "   \(bu" 6 
joachim99@56: and allows directory comparison and merge.  	 
joachim99@56: .SH "OPTIONS" 
joachim99@56: .PP 
joachim99@56: This program follows the usual GNU command line syntax, 
joachim99@56: with long options starting with two dashes (`-').  A summary of 
joachim99@56: options is included below. For a full summary of options, run 
joachim99@56: \fBkdiff3 --help\fR. 
joachim99@56:  
joachim99@56:  
joachim99@56: .IP "\fB-m, --merge\fP         " 10 
joachim99@56: Merge the input. 
joachim99@56: .IP "\fB-b, --base file\fP         " 10 
joachim99@56: Explicit base file. For compatibility with certain tools. 
joachim99@56: .IP "\fB-o, --output file\fP         " 10 
joachim99@56: Output file. Implies -m. E.g.: -o newfile.txt 
joachim99@56: .IP "\fB--out file\fP         " 10 
joachim99@56: Output file, again. (For compatibility with certain tools.) 
joachim99@56: .IP "\fB--auto\fP         " 10 
joachim99@56: No GUI if all conflicts are auto-solvable. (Needs -o file) 
joachim99@56: .IP "\fB--qall\fP         " 10 
joachim99@56: Don't solve conflicts automatically. (For compatibility...) 
joachim99@56: .IP "\fB--fname alias\fP         " 10 
joachim99@56: Visible name replacement. Supply this once for every input. 
joachim99@56: .IP "\fB-v, --version\fP         " 10 
joachim99@56: Show version of program.    
joachim99@56: .SH "AUTHOR" 
joachim99@56: .PP 
joachim99@56: This manual page was written by Eike Sauer <eikes@cs.tu-berlin.de> for 
joachim99@56: the \fBDebian\fP system (but may be used by others).  Permission is 
joachim99@56: granted to copy, distribute and/or modify this document under 
joachim99@56: the terms of the GNU General Public License, Version 2 
joachim99@56: (or, at your option, any later version published by the Free 
joachim99@56: Software Foundation). 
joachim99@56:  
joachim99@56: .PP 
joachim99@56: On Debian systems, the complete text of the GNU General Public 
joachim99@56: License can be found in /usr/share/common-licenses/GPL. 
joachim99@56:  
joachim99@56: .\" created by instant / docbook-to-man, Fri 07 Nov 2003, 15:46