aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2020-07-03 11:31:23 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2020-08-03 05:52:26 +0000
commit6d67dc851518d7ce30f793f0e102684175d4bc0e (patch)
tree2c651b284d6d71ae965e79dc52a56fd640c4faef
parent57c6a32b1089384f01b70b80e82af188b6c0e7d8 (diff)
Doc: Describe changing encoding if errors occur during diff
Change-Id: I54decf9aca700348134b96c6fd07172091a93dde Reviewed-by: David Schulz <david.schulz@qt.io>
-rw-r--r--doc/qtcreator/src/editors/creator-diff-editor.qdoc4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/qtcreator/src/editors/creator-diff-editor.qdoc b/doc/qtcreator/src/editors/creator-diff-editor.qdoc
index ca73e3b0f0..6614729293 100644
--- a/doc/qtcreator/src/editors/creator-diff-editor.qdoc
+++ b/doc/qtcreator/src/editors/creator-diff-editor.qdoc
@@ -75,6 +75,10 @@
\endlist
+ If \QC cannot detect the encoding of the files to compare, an info bar
+ appears that displays the option to reload the document using some other
+ encoding. For more information, see \l {File Encoding}.
+
\section1 Viewing the Changes
\image creator-diff-editor.png "Diff editor output in the Edit mode"