IDE Window: Diff: what changed
Revision 2 to 3. Removed lines have a minus sign; added lines have a plus sign.
| Old | New | Line | |
|---|---|---|---|
| 1 | 1 | ## Purpose | |
| 2 | 2 | ||
| 3 | 3 | The diff tool lets you compare two files (or selected parts from two files). It can create a **diff** in Context format. See: | |
| 4 | 4 | ||
| 5 | - | ||
| 5 | + | ```text | |
| 6 | + | http://en.wikipedia.org/wiki/Diff#Context_format. | |
| 7 | + | ``` | |
| 6 | 8 | ||
| 7 | 9 | ## Limitations | |
| 8 | 10 | ||
| 9 | 11 | It is not suitable for creating patches for systems like Subversion and Git that need the Unified format. See: | |
| 10 | 12 | ||
| 11 | - | ||
| 13 | + | ```text | |
| 14 | + | http://en.wikipedia.org/wiki/Diff#Unified_format | |
| 15 | + | ``` | |
| 12 | 16 | ||
| 13 | 17 | It performs a line-based comparison (not a word- or paragraph-based) comparison, so it only works for text files (including source code), not binary files. | |
| 14 | 18 | ||
| 15 | 19 | ## Text1 | |
| 16 | 20 | ||
| 17 | 21 | 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. | |
| 18 | 22 | ||
| 19 | 23 | ## Text2 | |
| 20 | 24 | ||
| 21 | 25 | 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. | |
| 22 | 26 | ||
| 23 | 27 | ## Options | |
| 24 | 28 | ||
| 25 | 29 | - **Case sensitive**: Distinguishes between lowercase and upper-case (capital letter) characters. | |
| 26 | 30 | - **Ignore spaces at start of line**: Ignore any indent when comparing two lines (whether space ' ' or tab characters). | |
| 27 | 31 | - **Ignore differences in line ends**: A unix line ending \#10 is treated as identical to a Windows line ending \#13#10. | |
| 28 | 32 | - **Ignore spaces (newline chars not included)**: Ignore all spaces. 'A B' is the same as 'AB'. | |
| 29 | 33 | - **Ignore if empty lines were added or removed**: Skip empty lines. | |
| 30 | 34 | - **Ignore spaces at end of line**: Ignore trailing spaces when comparing two lines. | |
| 31 | 35 | - **Ignore amount of space characters**: Any number of consecutive spaces is treated as one space. | |
| 32 | 36 | ||
| 33 | 37 | ## Close | |
| 34 | 38 | ||
| 35 | 39 | Close this dialog. | |
| 36 | 40 | ||
| 37 | 41 | ## Open Diff in Editor | |
| 38 | 42 | ||
| 39 | 43 | Close the dialog and open a new page in the source editor with the diff. | |
| 40 | 44 | ||
| 41 | 45 | ## Save diff | |
| 42 | 46 | ||
| 43 | 47 | Opens a file dialog to save the diff to a file. | |
| 44 | 48 | ||
| 45 | 49 | --- | |
| 46 | 50 | *From the Free Pascal wiki, page "IDE Window: Diff", as it stood on 2015-07-02 after a change by FTurtle, out of the wiki's dump of 2024-05-26. Copyright stays with the author who wrote it, according to the old wiki's [[Licensing]] page. If you have concerns about this material, [message the admin](/wiki-contact).* |