Difference between revisions of "IDE Window: Diff"
From Free Pascal wiki
Jump to navigationJump to searchJuhaManninen (talk | contribs) |
m |
||
| Line 1: | Line 1: | ||
{{IDE Window: Diff}} | {{IDE Window: Diff}} | ||
| − | The diff tool | + | The diff tool lets you compare two files (or selected parts from two files). It can create a '''diff''' in Context format. See: |
http://en.wikipedia.org/wiki/Diff#Context_format. | http://en.wikipedia.org/wiki/Diff#Context_format. | ||
It is not suitable for creating patches which need the Unified format. See: | It is not suitable for creating patches which need the Unified format. See: | ||
http://en.wikipedia.org/wiki/Diff#Unified_format | http://en.wikipedia.org/wiki/Diff#Unified_format | ||
| − | + | Because it performs a line-based comparison (not a word- or paragraph-based) comparison it only works for text files (including source code). | |
== Text1 == | == Text1 == | ||
| − | Select the first file | + | Select the first file in the comparison. |
| − | If | + | If any portion of text is selected within the file, then only this selected part of the text will be compared. |
== Text2 == | == Text2 == | ||
| − | Select the second file | + | Select the second file in the comparison. |
| − | If | + | If any portion of text is selected within the file, then only this selected part of the text will be compared. |
== Options == | == Options == | ||
| − | * '''Case sensitive''': | + | * '''Case sensitive''': Distinguishes between lowercase and upper-case (capital letter) characters. |
| − | * '''Ignore spaces at start of line''': Ignore | + | * '''Ignore spaces at start of line''': Ignore any indent when comparing two lines (whether space ' ' or tab characters). |
| − | * '''Ignore differences in line ends''': A unix line ending #10 is | + | * '''Ignore differences in line ends''': A unix line ending #10 is treated as identical to a Windows line ending #13#10. |
* '''Ignore spaces (newline chars not included)''': Ignore all spaces. 'A B' is the same as 'AB'. | * '''Ignore spaces (newline chars not included)''': Ignore all spaces. 'A B' is the same as 'AB'. | ||
* '''Ignore if empty lines were added or removed''': Skip empty lines. | * '''Ignore if empty lines were added or removed''': Skip empty lines. | ||
* '''Ignore spaces at end of line''': Ignore trailing spaces when comparing two lines. | * '''Ignore spaces at end of line''': Ignore trailing spaces when comparing two lines. | ||
| − | * '''Ignore amount of space characters''': Any | + | * '''Ignore amount of space characters''': Any number of consecutive spaces is treated as one space. |
== Close == | == Close == | ||
Revision as of 19:11, 10 August 2014
│
Deutsch (de) │
English (en) │
español (es) │
suomi (fi) │
français (fr) │
The diff tool lets you compare two files (or selected parts from two files). It can create a diff in Context format. See:
http://en.wikipedia.org/wiki/Diff#Context_format.
It is not suitable for creating patches which need the Unified format. See:
http://en.wikipedia.org/wiki/Diff#Unified_format
Because it performs a line-based comparison (not a word- or paragraph-based) comparison it only works for text files (including source code).
Text1
Select the first file in the comparison. If any portion of text is selected within the file, then only this selected part of the text will be compared.
Text2
Select the second file in the comparison. If any portion of text is selected within the file, then only this selected part of the text will be compared.
Options
- Case sensitive: Distinguishes between lowercase and upper-case (capital letter) characters.
- Ignore spaces at start of line: Ignore any indent when comparing two lines (whether space ' ' or tab characters).
- Ignore differences in line ends: A unix line ending #10 is treated as identical to a Windows line ending #13#10.
- Ignore spaces (newline chars not included): Ignore all spaces. 'A B' is the same as 'AB'.
- Ignore if empty lines were added or removed: Skip empty lines.
- Ignore spaces at end of line: Ignore trailing spaces when comparing two lines.
- Ignore amount of space characters: Any number of consecutive spaces is treated as one space.
Close
Close this dialog.
Open Diff in Editor
Close the dialog and open a new page in the source editor with the diff.
Save diff
Opens a file dialog to save the diff to a file.
