diff options
| author | gregory guy <gregory-tde@laposte.net> | 2020-06-27 14:46:01 +0200 |
|---|---|---|
| committer | gregory guy <gregory-tde@laposte.net> | 2020-06-27 14:46:01 +0200 |
| commit | e14732aa76b0fc20b955da434b1e2e92012c34e8 (patch) | |
| tree | 5dfb589ae107ddaa2288783aa78f80b5dc3ff894 /data/doc/saving.html | |
| parent | eadb41b09fb5d6e46cf98c0d6dee1723c8307d89 (diff) | |
| download | kdiff3-e14732aa76b0fc20b955da434b1e2e92012c34e8.tar.gz kdiff3-e14732aa76b0fc20b955da434b1e2e92012c34e8.zip | |
Drop automake build support.
Add basic cmake build instructions.
Delete the NEWS file.
Rework of the README.
The man folder has been moved into the doc folder for consistency with what
have been done so far.
The html pages have been moved into the doc folder as well.
Some cosmetics.
Signed-off-by: gregory guy <gregory-tde@laposte.net>
Diffstat (limited to 'data/doc/saving.html')
| -rw-r--r-- | data/doc/saving.html | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/data/doc/saving.html b/data/doc/saving.html deleted file mode 100644 index 3d648fd..0000000 --- a/data/doc/saving.html +++ /dev/null @@ -1,16 +0,0 @@ -<html><head><title>Saving</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="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="selections.html" title="Select, Copy And Paste"><link rel="next" href="find.html" title="Finding Strings"><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">Saving</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="selections.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="find.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="saving"></a>Saving</h2></div></div></div><p> - Saving will only be allowed, when all conflicts were solved. If the file - already exists and the "Backup files"-option is enabled then the existing - file will be renamed with an ".orig"-extension, but if such a file exists - it will be deleted. When you exit or start another diff-analysis and data - wasn't saved yet, then <span class="application">KDiff3</span> will ask if you want to save, cancel or proceed - without saving. (<span class="application">KDiff3</span> does not catch any signals. So if you "kill" <span class="application">KDiff3</span> - then your data will be lost.) -</p><p> - Line endings are saved according to the normal method on the underlying - operating system. For Unices each line ends with an linefeed-character "\n", - while for Win32-based systems each line ends with a carriage-return + a linefeed - "\r\n". <span class="application">KDiff3</span> does not preserve the line-endings of the input files, which - also means that you shouldn't use <span class="application">KDiff3</span> with binary files. -</p></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="selections.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="find.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">Select, Copy And Paste </div><div class="navRight"> Finding Strings</div><div class="navCenter"><a accesskey="u" href="documentation.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>
\ No newline at end of file |