| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" |
| "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
| <!-- |
| |
| Licensed to the Apache Software Foundation (ASF) under one |
| or more contributor license agreements. See the NOTICE file |
| distributed with this work for additional information |
| regarding copyright ownership. The ASF licenses this file |
| to you under the Apache License, Version 2.0 (the |
| "License"); you may not use this file except in compliance |
| with the License. You may obtain a copy of the License at |
| |
| http://www.apache.org/licenses/LICENSE-2.0 |
| |
| Unless required by applicable law or agreed to in writing, |
| software distributed under the License is distributed on an |
| "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY |
| KIND, either express or implied. See the License for the |
| specific language governing permissions and limitations |
| under the License. |
| |
| --> |
| <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> |
| <head> |
| <title>Options Window: Miscellaneous: Diff</title> |
| <link rel="stylesheet" href="ide.css" title="Oracle BLAFDoc" type="text/css"/> |
| </head> |
| |
| <body> |
| <p><a id="org.netbeans.modules.diff.options.DiffOptionsController" name="org.netbeans.modules.diff.options.DiffOptionsController"></a></p> |
| <div id="NBCSH313"><!-- infolevel="all" infotype="General" --><a id="sthref19" name="sthref19"></a> |
| <h1>Options Window: Miscellaneous: Diff</h1> |
| <a name="BEGIN" id="BEGIN"></a> |
| <p>You use this panel to specify the Diff Engine to use when comparing file revisions. If you use an external diff engine you can set diff command options in this panel. |
| <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer"> |
| <param name="content" value="http://www.oracle.com/pls/topic/lookup?ctx=nb8200&id=NBDAG2068"> |
| <param name="text" value="<html><u>More</u></html>"> |
| <param name="textFontSize" value="medium"> |
| <param name="textColor" value="blue"> |
| </object> |
| </p> |
| <p>You can select the following diff engine options:</p> |
| |
| <table summary="User interface elements and descriptions" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0"> |
| <col width="24%" /> |
| <col width="*" /> |
| <thead> |
| <tr align="left" valign="top"> |
| <th align="left" valign="bottom" id="r1c1-t26">Element</th> |
| <th align="left" valign="bottom" id="r1c2-t26">Description</th> |
| </tr> |
| </thead> |
| <tbody> |
| <tr align="left" valign="top"> |
| <td align="left" id="r2c1-t26" headers="r1c1-t26"> |
| <p>Internal Diff</p> |
| </td> |
| <td align="left" headers="r2c1-t26 r1c2-t26">If selected, the IDE uses its internal diff engine. When using the internal diff engine, you can let the engine ignore white spaces and changes in case. The former option is selected by default.</td> |
| </tr> |
| <tr align="left" valign="top"> |
| <td align="left" id="r3c1-t26" headers="r1c1-t26"> |
| <p>External Diff</p> |
| </td> |
| <td align="left" headers="r3c1-t26 r1c2-t26">If selected, the IDE uses an external command-line diff executable. You can specify any diff command options (for example, <code dir="ltr">diff -b</code>) to be used when running the diff command from a command-line executable in the IDE. Diff options are not availabe when using the built-in diff engine. |
| <p>To use this option, you must have a command-line diff executable installed on your system if you want to compare revisions.</p> |
| </td> |
| </tr> |
| </tbody> |
| </table> |
| <br /> |
| <!-- --> |
| <a id="NBCSH316" name="NBCSH316"></a> |
| <hr><p><b>Related Topics</b></p> |
| <p><i>Developing Applications with NetBeans IDE</i>, |
| <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer"> |
| <param name="content" value="http://www.oracle.com/pls/topic/lookup?ctx=nb8200&id=NBDAG117"> |
| <param name="text" value="<html><u>"Working with the Options Window"</u></html>"> |
| <param name="textFontSize" value="medium"> |
| <param name="textColor" value="blue"> |
| </object> |
| </p> |
| |
| <!-- --> |
| <!-- Start Footer --> |
| |
| |
| <table summary="" cellspacing="0" cellpadding="0" width="100%"> |
| <tr> |
| <td align="left" width="86%"><a href="legal_notice.htm"> |
| Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> |
| </td> |
| </tr> |
| </table> |
| <!-- --> |
| </body> |
| </html> |
