feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Doc: Describe new Diff editor options

Browse Source 
You can now view unsaved changes in the current file
or all open files.

Added a subtitle and moved the image to the new section.

Change-Id: I8135dc7c9e2edc60b88d84a241f6d959ba590464
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Leena Miettinen
2016-10-31 10:46:22 +01:00
parent f8cf53875e
commit 5570798f54
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
doc/src/editors/creator-diff-editor.qdoc
View File

@@ -37,22 +37,32 @@
\title Comparing Files \title Comparing Files
You can use a diff editor from \QC to compare two text files. They can be You can use a diff editor to display unsaved changed in the current file or
either versions of the same file or arbitrary files. all open files or to compare any two text files that can be either versions
of the same file or arbitrary files.
\image creator-diff-editor.png "Diff editor output in the Edit mode" To view unsaved changes in the current file, select \uicontrol Tools >
\uicontrol Diff > \uicontrol {Diff Current File}.
To compare files: To view unsaved changes in all open files, select \uicontrol Tools >
\uicontrol Diff > \uicontrol {Diff Open Files}.
To compare two files:
\list 1 \list 1
\li Select \uicontrol Tools > \uicontrol Diff. \li Select \uicontrol Tools > \uicontrol Diff >
\uicontrol {Diff External Files}.
\li Select two files to compare. \li Select two files to compare.
\endlist \endlist
The differences are output in the \uicontrol Edit mode. Color coding is used \section1 Viewing the Changes
\image creator-diff-editor.png "Diff editor output in the Edit mode"
The changes are displayed in the \uicontrol Edit mode. Color coding is used
to mark changed lines. By default, light red indicates lines that contain to mark changed lines. By default, light red indicates lines that contain
removed text (painted a darker red) in the left pane and light green removed text (painted a darker red) in the left pane and light green
indicates lines that contain added text (painted a darker green) in the indicates lines that contain added text (painted a darker green) in the