|
Lines 48-54
Link Here
|
| 48 |
<ol type="a"> |
48 |
<ol type="a"> |
| 49 |
<li><i>Diff output format</i> - Allows the choice of several common diff |
49 |
<li><i>Diff output format</i> - Allows the choice of several common diff |
| 50 |
output formats. <i>Unified</i> is the format used by many patch application |
50 |
output formats. <i>Unified</i> is the format used by many patch application |
| 51 |
tools including Eclipse.</li> |
51 |
tools including Eclipse. |
|
|
52 |
Format used in Context and Unified diffs allow to apply a patch, even though the line number mentioned for the hunk (patch terminology) is incorrect. |
| 53 |
In this case, the algorithm scans both forwards and backwards for a set of lines matching the context given for the hunk.</li> |
| 52 |
<li><i>Patch Root</i> - Allows you to specify at what level your patch is rooted at. The choices |
54 |
<li><i>Patch Root</i> - Allows you to specify at what level your patch is rooted at. The choices |
| 53 |
are <i>Workspace</i>, <i>Project</i> and <i>Selection</i>.<br> |
55 |
are <i>Workspace</i>, <i>Project</i> and <i>Selection</i>.<br> |
| 54 |
<br><i>Workspace</i> allows you to include resources from multiple projects in your patch and is the <em>default</em> option. Workspace |
56 |
<br><i>Workspace</i> allows you to include resources from multiple projects in your patch and is the <em>default</em> option. Workspace |
|
Lines 132-141
Link Here
|
| 132 |
</li> |
134 |
</li> |
| 133 |
|
135 |
|
| 134 |
<li> |
136 |
<li> |
| 135 |
Adjust the <i>Maximum fuzz factor</i> (patch terminology). |
137 |
Adjust the <i>Fuzz factor</i> (patch terminology). |
| 136 |
This factor determines how much the location of the patch in the |
138 |
This factor indicates the amount of hunk context lines to ignore. |
| 137 |
target file may have changed since the patch was originally generated. |
139 |
The default value is zero, which means that all lines need to match. |
| 138 |
The default value is two, but it's not automatically applied. |
140 |
For the fuzz factor equal one it's the first and last line of context. |
| 139 |
Press the <b>Guess</b> to calculate the fuzz factor that will allow the most hunks to be matched. |
141 |
Press the <b>Guess</b> to calculate the fuzz factor that will allow the most hunks to be matched. |
| 140 |
</li> |
142 |
</li> |
| 141 |
|
143 |
|
