Sophie

Sophie

distrib > Mandriva > 10.2 > i586 > media > contrib > by-pkgid > a1a8a1511d610277a926fcdfef64386b > files > 67

kdiff3-0.9.88-1mdk.i586.rpm

<html><head><title>Other Functions</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="home" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><link rel="previous" href="dirmergeoptions.html" title="Options for Comparing and Merging Directories"><link rel="next" href="misc.html" title="Chapter 4. Miscellaneous Topics"><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"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr class="header"><td colspan="2"> </td></tr><tr id="logo"><td valign="top"><img src="common/kde_logo.png" alt="KDE -         The K Desktop Environment" width="296" height="79" border="0"></td><td valign="middle" align="center" id="location"><h1>Other Functions</h1></td></tr></table><table width="100%" class="header"><tbody><tr><td align="left" class="navLeft" width="33%"><a accesskey="p" href="dirmergeoptions.html">Prev</a></td><td align="center" class="navCenter" width="34%">Directory Comparison and Merge with KDiff3</td><td align="right" class="navRight" width="33%"> 
		      <a accesskey="n" href="misc.html">Next</a></td></tr></tbody></table><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="other"></a>Other Functions</h2></div></div><div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2541372"></a>Split/Full Screen Mode</h3></div></div><div></div></div><p>
   Usually the directory merge list view remains visible while a single file
   is compared or merged. With the mouse you can move the the splitter bar that
   separates the file list from the text-diff windows. If you don't want this,
   you can disable "Split Screen View" in the "Directory"-menu. Then you can
   use "Toggle View" in the "Directory"-menu to switch between the file list
   and the text-diff view that then occupy the full screen.
</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2541398"></a>Comparing or Merging a Single File</h3></div></div><div></div></div><p>
   Probably you will prefer a simple double mouse click on a file in order
   to compare it. Nevertheless there also exists an entry in the "Directory"-menu.
   You can also directly merge a single file, without starting the directory
   merge via the "Merge single file" in the "Directory"-Menu. On saving the
   result, the status will be set to done, and the file will not be merged again
   if a directory merge is started.
</p><p>
   But note that this status information will be lost when you rerun a directory
   scan: "Directory"-menu: "Rescan"
</p></div></div><table width="100%" class="bottom-nav"><tr><td width="33%" align="left" valign="top" class="navLeft"><a href="dirmergeoptions.html">Prev</a></td><td width="34%" align="center" valign="top" class="navCenter"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top" class="navRight"><a href="misc.html">Next</a></td></tr><tr><td width="33%" align="left" class="navLeft">Options for Comparing and Merging Directories </td><td width="34%" align="center" class="navCenter"><a href="dirmerge.html">Up</a></td><td width="33%" align="right" class="navRight"> Miscellaneous Topics</td></tr></table></body></html>