Difference between revisions of "IDE Window: Diff"
From Lazarus wiki
Jump to navigationJump to searchJuhaManninen (talk | contribs) |
JuhaManninen (talk | contribs) |
||
Line 2: | Line 2: | ||
The diff tool alows to compare two files or selections of two files. It can create a '''diff''' in Context_format. | The diff tool alows to compare two files or selections of two files. It can create a '''diff''' in Context_format. | ||
− | http://en.wikipedia.org/wiki/Diff#Context_format. | + | http://en.wikipedia.org/wiki/Diff#Context_format. |
− | |||
The comparison is line based (not words or paragraphs). So it only works for text files (sources). | The comparison is line based (not words or paragraphs). So it only works for text files (sources). | ||
Revision as of 18:30, 10 August 2014
│
Deutsch (de) │
English (en) │
español (es) │
suomi (fi) │
français (fr) │
The diff tool alows to compare two files or selections of two files. It can create a diff in Context_format.
http://en.wikipedia.org/wiki/Diff#Context_format.
The comparison is line based (not words or paragraphs). So it only works for text files (sources).
Text1
Select the first file to compare. If there is a selection available you can compare only this part of the text.
Text2
Select the second file to compare. If there is a selection available you can compare only this part of the text.
Options
- Case sensitive: Distinguish small letters and captials
- Ignore spaces at start of line: Ignore the indenting space when comparing two lines. This includes tab characters.
- Ignore differences in line ends: A unix line ending #10 is the same as 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 amount of 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.