31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
-
+
+
-
+
+
|
that look the same and place them abreast. The "small"
version do not parse big blocks to avoid long runs.
The Char and Word options selects if the line parsing should
highlight full words only, or check single characters.
2nd stage : More thorough parsing of a line.
Mark last : Last change of a line is underlined
Colours : Choose highlight colours.
Diffs only : Only differing lines will be displayed.
Context : You can select that only differing lines shall be displayed,
and how many surrounding lines are shown.
Force crlf translation : (Windows only) Use crlf mode when reading files.
Save default: Save current option settings in ~/.eskilrc
Search Menu
Find : Search dialog
Find next : Repeat search
Find prev : Repeat search backwards
Tools Menu
New Diff Window : Open another diff window.
Directory Diff : Window for comparing directories
Clip Diff : Gives two areas where you can paste text and diff them.
Merge : Perform a two way merge.
Align : Try to get two lines to line up in a new diff.
Clear Align : Clear alignment info for this diff. The effect does not
show until you do "Redo Diff".
Diff Options Field: Any text written here will be passed to diff.
Rev 1/2 Fields : In RCS/CVS mode, these field are passed as -r options to
diff, to select versions.
Prev Diff Button: Scrolls to the previous differing block, or to the top
if there are no more diffs.
|