Eskil

Check-in [dde807ea23]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Added alignment section.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: dde807ea238bc862d9b7673f0133379b5505ebd7
User & Date: peter 2004-05-26 10:28:19.000
Context
2004-05-26
10:29
Updateded to new Nagelfar inline comment syntax. Added DiffUtil. check-in: 1efc65fbf6 user: peter tags: trunk
10:28
Added alignment section. check-in: dde807ea23 user: peter tags: trunk
10:27
Added Context and Clear Align menu descriptions. check-in: c5d27f32bf user: peter tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to doc/tutorial.txt.
︙︙
23
24
25
26
27
28
29

















30
31
32
33
34
35
36

Scroll down and right click over the line numbers belonging to the block
in the right part, and select "Separate Diff".
A diff window appears, revealing that there was a small difference
within the moved block.

Close the last diff window.


















<b>Changed filename in directory diff</b>

Right click on "namechange1" in Directory Diff's left window.
Select "Mark File" in the menu.
Right click on "namechange2" in Directory Diff's right window.
Select "Compare with..." in the menu.









>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>








23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53

Scroll down and right click over the line numbers belonging to the block
in the right part, and select "Separate Diff".
A diff window appears, revealing that there was a small difference
within the moved block.

Close the last diff window.

<b>Alignment</b>

Return to example.c. Double click in the directory diff if needed.

Another way to achieve the same check as in the Separate Diff above
is to align rows that the first diff do not think belong together.
Scroll to the line "case TEXT_CGET" in the left window and right
click on the line number.  Select "Mark line for alignment".
Scroll down to the line "case TEXT_CGET" in the right window and right
click on the line number.  Select "Align with line xx on other side".

Now those lines are remembered, and you could add more alignment pairs
before you proceed with regenerating the view.
Select menu File->Redo Diff.

To clear the alignment information, select menu Tools->Clear Align.

<b>Changed filename in directory diff</b>

Right click on "namechange1" in Directory Diff's left window.
Select "Mark File" in the menu.
Right click on "namechange2" in Directory Diff's right window.
Select "Compare with..." in the menu.
︙︙