<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ <!-- Process this file with docbook-to-man to generate an nroff manual page: `docbook-to-man manpage.sgml > manpage.1'. You may view the manual page with: `docbook-to-man kdiff3.sgml | nroff -man | less'. A typical entry in a Makefile or Makefile.am is: manpage.1: manpage.sgml docbook-to-man $< > $@ The docbook-to-man binary is found in the docbook-to-man package. Please remember that if you create the nroff version in one of the debian/rules file targets (such as build), you will need to include docbook-to-man in your Build-Depends control field. --> <!-- Fill in your name for FIRSTNAME and SURNAME. --> <!ENTITY dhfirstname "<firstname>EIKE</firstname>"> <!ENTITY dhsurname "<surname>SAUER</surname>"> <!-- Please adjust the date whenever revising the manpage. --> <!ENTITY dhdate "<date>Oktober 2, 2006</date>"> <!-- SECTION should be 1-8, maybe w/ subsection other parameters are allowed: see man(7), man(1). --> <!ENTITY dhsection "<manvolnum>1</manvolnum>"> <!ENTITY dhemail "<<email>eikes@cs.tu-berlin.de</email>>"> <!ENTITY dhusername "Eike Sauer"> <!ENTITY dhucpackage "<refentrytitle>KDIFF3</refentrytitle>"> <!ENTITY dhpackage "KDiff3"> <!ENTITY debian "<productname>Debian</productname>"> <!ENTITY gnu "<acronym>GNU</acronym>"> <!ENTITY gpl "&gnu; <acronym>GPL</acronym>"> ]> <refentry> <refentryinfo> <address> &dhemail; </address> <author> &dhfirstname; &dhsurname; </author> <copyright> <year>2003, 2006</year> <holder>&dhusername;</holder> </copyright> &dhdate; </refentryinfo> <refmeta> &dhucpackage; &dhsection; </refmeta> <refnamediv> <refname>&dhpackage;</refname> <refpurpose>compares two or three input files or directories</refpurpose> </refnamediv> <refsynopsisdiv> <cmdsynopsis> <command>&dhpackage;</command> <arg><option>QT options</option></arg> <arg><option>KDE options</option></arg> <arg><option>KDiff3 options</option></arg> <arg><option><replaceable>File1/base</replaceable></option></arg> <arg><option><replaceable>File2</replaceable></option></arg> <arg><option><replaceable>File3</replaceable></option></arg> </cmdsynopsis> </refsynopsisdiv> <refsect1> <title>DESCRIPTION</title> <para>This manual page documents briefly the <command>&dhpackage;</command> tool.</para> <para>This manual page was written for the &debian; distribution because the original program does not have a manual page. For comprehensive help, please see <command>khelpcenter help:/kdiff3</command>. </para> <para><command>&dhpackage;</command> is a program that <ItemizedList SPACING="compact"> <ListItem><para>compares or merges two or three text input files or directories</para></ListItem> <ListItem><para>shows the differences line by line and character by character</para></ListItem> <ListItem><para>provides an automatic merge-facility and</para></ListItem> <ListItem><para>an integrated editor for comfortable solving of merge-conflicts</para></ListItem> <ListItem><para>supports Unicode, UTF-8 and other codecs</para></ListItem> <ListItem><para>supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.)</para></ListItem> <ListItem><para>Printing of differences</para></ListItem> <ListItem><para>Manual alignment of lines</para></ListItem> <ListItem><para>Automatic merging of version control history ($Log$)</para></ListItem> </ItemizedList> </para> </refsect1> <refsect1> <title>OPTIONS</title> <para>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 <command>&dhpackage; --help</command>. </para> <variablelist> <varlistentry> <term><option>-m, --merge</option> </term> <listitem> <para>Merge the input.</para> </listitem> </varlistentry> <varlistentry> <term><option>-b, --base file</option> </term> <listitem> <para>Explicit base file. For compatibility with certain tools.</para> </listitem> </varlistentry> <varlistentry> <term><option>-o, --output file</option> </term> <listitem> <para>Output file. Implies -m. E.g.: -o newfile.txt</para> </listitem> </varlistentry> <varlistentry> <term><option>--out file</option> </term> <listitem> <para>Output file, again. (For compatibility with certain tools.)</para> </listitem> </varlistentry> <varlistentry> <term><option>--auto</option> </term> <listitem> <para>No GUI if all conflicts are auto-solvable. (Needs -o file)</para> </listitem> </varlistentry> <varlistentry> <term><option>--qall</option> </term> <listitem> <para>Don't solve conflicts automatically. (For compatibility...)</para> </listitem> </varlistentry> <varlistentry> <term><option>-L1 alias</option> </term> <listitem> <para>Visible name replacement for first file/base file.</para> </listitem> </varlistentry> <varlistentry> <term><option>-L2 alias</option> </term> <listitem> <para>Visible name replacement for second file.</para> </listitem> </varlistentry> <varlistentry> <term><option>-L3 alias</option> </term> <listitem> <para>Visible name replacement for third file.</para> </listitem> </varlistentry> <varlistentry> <term><option>-L, --fname alias</option> </term> <listitem> <para>Visible name replacement. May by supplied for each input.</para> </listitem> </varlistentry> <varlistentry> <term><option>--cs string</option> </term> <listitem> <para>Change a setting, e. g. --cs "AutoAdvance=1".</para> </listitem> </varlistentry> <varlistentry> <term><option>--confighelp</option> </term> <listitem> <para>Show a list of all settings and their values.</para> </listitem> </varlistentry> <varlistentry> <term><option>--config file </option> </term> <listitem> <para>Use a different settings file.</para> </listitem> </varlistentry> <varlistentry> <term><option>--author</option> </term> <listitem> <para>Show author of program.</para> </listitem> </varlistentry> <varlistentry> <term><option>-v, --version</option> </term> <listitem> <para>Show version of program.</para> </listitem> </varlistentry> <varlistentry> <term><option>--license</option> </term> <listitem> <para>Show license of program.</para> </listitem> </varlistentry> </variablelist> </refsect1> <refsect1> <title>AUTHOR</title> <para>This manual page was written by &dhusername; &dhemail; 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). </para> <para> On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL. </para> </refsect1> </refentry> <!-- Keep this comment at the end of the file Local variables: mode: sgml sgml-omittag:t sgml-shorttag:t sgml-minimize-attributes:nil sgml-always-quote-attributes:t sgml-indent-step:2 sgml-indent-data:t sgml-parent-document:nil sgml-default-dtd-file:nil sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil End: -->