From 7478ca6e1437301482578bfcfa168fa6ace45bb5 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Mon, 13 Jan 2014 23:20:08 -0600 Subject: Fix help handbook, man page, and location of html doc files. --- data/doc/saving.html | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 data/doc/saving.html (limited to 'data/doc/saving.html') diff --git a/data/doc/saving.html b/data/doc/saving.html new file mode 100644 index 0000000..3d648fd --- /dev/null +++ b/data/doc/saving.html @@ -0,0 +1,16 @@ +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