From e14732aa76b0fc20b955da434b1e2e92012c34e8 Mon Sep 17 00:00:00 2001 From: gregory guy Date: Sat, 27 Jun 2020 14:46:01 +0200 Subject: 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 --- data/doc/saving.html | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 data/doc/saving.html (limited to 'data/doc/saving.html') 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 @@ -Saving
Saving
Prev
Next
File Comparison And Merge

Saving

- 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 KDiff3 will ask if you want to save, cancel or proceed - without saving. (KDiff3 does not catch any signals. So if you "kill" KDiff3 - then your data will be lost.) -

- 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". KDiff3 does not preserve the line-endings of the input files, which - also means that you shouldn't use KDiff3 with binary files. -

Prev
Next
Home
Select, Copy And Paste 
 Finding Strings
Up


Would you like to make a comment or contribute an update to this page?
- Send feedback to the KDE Docs Team

\ No newline at end of file -- cgit v1.2.3