87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
-
+
-
+
|
You can, for each difference, select which version you want to appear in the output file. The buttons "LR", "L", "R" and "RL" select the lines from the left file, right file or both files.
"Prev" and "Next" buttons moves between differences.
"All L" and "All R" buttons select "L" or "R" for all differences.
"Pure" ...
"Save" saves the merge result to a file.
On the keyboard, Up and Down keys means the same as "Prev" and "Next". Left and Right keys selects "L" and "R".
On the keyboard, Up and Down keys means the same as "Prev" and "Next". Left and Right keys selects "L" and "R". Shift-Up and Shift-Down jumps 10 changes, or if there are conflicts jumps to next conflict.
When saved it is the contents of the text widget that is saved which means you can hand edit there if you are careful. E.g. you can't use cursor keys, but you can type text, delete text and copy/paste with mouse assistance.
When saved it is the contents of the text widget that is saved which means you can hand edit there if you are careful. Press Escape to bring focus out of the text and make cursor keys navigate between changes.
<b><ul>Examples of effects of parse options.</ul></b>
Below are two example files, and five different results when using different options with those files.
<example>Left file: \tRight file:
<pre>NET '/I$1/N$1454' IC2-15 IC5-7 \tNET '/I$1/N$1454' IC1-4 IC2-15 IC5-2 IC5-7
|