1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
<html><head><title>More Features</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="introduction.html" title="Chapter 1. Introduction"><link rel="prev" href="screenshots.html" title="Screenshots and Features"><link rel="next" href="documentation.html" title="Chapter 2. File Comparison And Merge"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">More Features</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="screenshots.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="documentation.html">Next</a></div><div class="navCenter">Introduction</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="features"></a>More Features</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2490911"></a> Line-By-Line And Char-By-Char Diff-Viewer</h3></div></div></div><p>By using the possiblities of a graphical color display <span class="application">KDiff3</span> shows
exactly what the difference is. When you have to do many code-reviews, you will like this.
</p><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="letter_by_letter.png"><hr></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2490942"></a> See White-Space Differences At One Glance</h3></div></div></div><p>Spaces and tabs that differ appear visibly. When lines differ only
in the amount of white space this can be seen at one look in the summary
column on the left side. (No more worries when people change the indentation.)
</p><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="white_space.png"><hr></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2490972"></a> Triple-Diff</h3></div></div></div><p> Analyze three files and see where they differ.
</p><p>
The left/middle/right windows are named A/B/C and have the blue/green/magenta
color respectively.
</p><p>
If one file is the same and one file is different on a line then the
color shows which file is different. The red color means that both other
files are different.
</p><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="triple_diff.png"><hr></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2491007"></a> Comfortable Merge Of Two Or Three Input Files</h3></div></div></div><p> <span class="application">KDiff3</span> can be used to merge two or three input files and automatically
merges as much as possible. The result is presented in an editable window
where most conflicts can be solved with a single mouseclick: Select the
buttons A/B/C from the button-bar to select the source that should be used.
You can also select more than one source. Since this output window is an
editor even conflicts which need further corrections can be solved here without
requiring another tool.
</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2491031"></a>And ...</h3></div></div></div><div class="itemizedlist"><ul type="disc"><li><p>Fast navigation via buttons.</p></li><li><p>A mouse-click into a summary column sync's all windows to show the same position.</p></li><li><p>Select and copy from any window and paste into the merge result window.</p></li><li><p>Overview column that shows where the changes and conflicts are.</p></li><li><p>The colors are adjustable to your specific preferences.</p></li><li><p>Adjustable Tab size.</p></li><li><p>Option to insert spaces instead of tabs.</p></li><li><p>Open files comfortably via dialog or specify files on the command line.</p></li><li><p>Search for strings in all text windows. Find (Ctrl-F) and Find Next (F3)</p></li><li><p>Show the line numbers for each line. </p></li><li><p>Paste clipboard or drag text into a diff input window.</p></li><li><p>Networktransparency via TDEIO.</p></li><li><p>Can be used as diff-viewer in KDevelop 3.</p></li><li><p>Word-wrap for long lines.</p></li><li><p>Support for Unicode, UTF-8 and other codecs.</p></li><li><p>Support for right to left languages.</p></li><li><p>...</p></li></ul></div></div></div><div style="background-color: #white; color: black; margin-top: 20px; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="screenshots.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="documentation.html">Next</a></div><div align="center"><a accesskey="h" href="index.html">Home</a></div></div><div style="background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div class="navLeft">Screenshots and Features </div><div class="navRight"> File Comparison And Merge</div><div class="navCenter"><a accesskey="u" href="introduction.html">Up</a></div></div><br><br><div class="bannerBottom" style="background-image: url(help:/common/bottom-middle.png); background-repeat: x-repeat; width: 100%; height: 100px; bottom:0px;"><div class="BannerBottomRight"><img src="help:/common/bottom-right.png" style="margin: 0px" alt=""></div><div class="bannerBottomLeft"><img src="help:/common/bottom-left.png" style="margin: 0px;" alt=""></div><div id="comments" style="position:relative; top: 5px; left: 1em; height:85px; width: 50%; color: #cfe1f6"><p>Would you like to make a comment or contribute an update to this page?<br>
Send feedback to the <a href="mailto:kde-docs@kdemail.net" style="background:transparent; color:#cfe1f6; text-decoration: underline;">KDE Docs Team</a></p></div></div></body></html>
|
