IDE Window: Diff: what changed

Revision 1 to 2. Removed lines have a minus sign; added lines have a plus sign.

Old	New		Line
1		-	~~## Contents~~
2		-
3		-	* 1 Purpose
4		-	* 2 Limitations
5		-	* 3 Text1
6		-	* 4 Text2
7		-	* 5 Options
8		-	* 6 Close
9		-	* 7 Open Diff in Editor
10		-	* 8 Save diff
11		-
12	1		## Purpose
13	2
14		-	~~The diff tool lets you compare two files (or selected parts from two files). It can create a diff in Context format. See:~~
15		-	~~```~~
16		-	~~<http://en.wikipedia.org/wiki/Diff#Context_format>.~~
17		-	~~```~~
	3	+	The diff tool lets you compare two files (or selected parts from two files). It can create a diff in Context format. See:
18	4
	5	+	[`http://en.wikipedia.org/wiki/Diff#Context_format`](http://en.wikipedia.org/wiki/Diff#Context_format)`.`
	6	+
19	7		## Limitations
20	8
21		-	~~It is not suitable for creating patches for systems like Subversion and Git that need the Unified format. See:~~
22		-	~~```~~
23		-	~~<http://en.wikipedia.org/wiki/Diff#Unified_format>~~
24		-	~~```~~
	9	+	It is not suitable for creating patches for systems like Subversion and Git that need the Unified format. See:
25	10
26		-	~~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.~~
	11	+	[`http://en.wikipedia.org/wiki/Diff#Unified_format`](http://en.wikipedia.org/wiki/Diff#Unified_format)
27	12
	13	+	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	+
28	15		## Text1
29	16
30		-	~~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.~~
	17	+	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.
31	18
32	19		## Text2
33	20
34		-	~~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.~~
	21	+	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.
35	22
36	23		## Options
37	24
38		-	* Case sensitive : Distinguishes between lowercase and upper-case (capital letter) characters.
39		-	* Ignore spaces at start of line : Ignore any indent when comparing two lines (whether space ' ' or tab characters).
40		-	* Ignore differences in line ends : A unix line ending #10 is treated as identical to a Windows line ending #13#10.
41		-	* Ignore spaces (newline chars not included) : Ignore all spaces. 'A B' is the same as 'AB'.
42		-	* Ignore if empty lines were added or removed : Skip empty lines.
43		-	* Ignore spaces at end of line : Ignore trailing spaces when comparing two lines.
44		-	* Ignore amount of space characters : Any number of consecutive spaces is treated as one space.
	25	+	- Case sensitive: Distinguishes between lowercase and upper-case (capital letter) characters.
	26	+	- Ignore spaces at start of line: Ignore any indent when comparing two lines (whether space ' ' or tab characters).
	27	+	- Ignore differences in line ends: A unix line ending \#10 is treated as identical to a Windows line ending \#13#10.
	28	+	- Ignore spaces (newline chars not included): Ignore all spaces. 'A B' is the same as 'AB'.
	29	+	- Ignore if empty lines were added or removed: Skip empty lines.
	30	+	- Ignore spaces at end of line: Ignore trailing spaces when comparing two lines.
	31	+	- Ignore amount of space characters: Any number of consecutive spaces is treated as one space.
45	32
46	33		## Close
47	34
48		-	~~Close this dialog.~~
	35	+	Close this dialog.
49	36
50	37		## Open Diff in Editor
51	38
52		-	~~Close the dialog and open a new page in the source editor with the diff.~~
	39	+	Close the dialog and open a new page in the source editor with the diff.
53	40
54	41		## Save diff
55	42
56	43		Opens a file dialog to save the diff to a file.
57	44
58	45		---
59		-	From the Free Pascal wiki, page "IDE Window: Diff", as the Internet Archive kept it on 2024-08-09. 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).
	46	+	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).

Back to history