Difference between revisions of "IDE Window: Diff"

From Free Pascal wiki
Jump to navigationJump to search
 
Line 1: Line 1:
ToDo
+
The diff tool alows to compare two files or selections of two files. It can create a '''diff''' or '''patch'''.
 +
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 selction available you can compare only this part of the text.
 +
 
 +
= Text2 =
 +
 
 +
Select the second file to compare.
 +
If there is a selction available you can compare only this part of the text.
 +
 
 +
= Options =
 +
 
 +
* '''Case sensitive''': Distinguish small an big letters
 +
* '''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 agt end of line''':

Revision as of 16:54, 11 July 2006

The diff tool alows to compare two files or selections of two files. It can create a diff or patch. 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 selction available you can compare only this part of the text.

Text2

Select the second file to compare. If there is a selction available you can compare only this part of the text.

Options

  • Case sensitive: Distinguish small an big letters
  • 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 agt end of line: