There are two output styles: diff and sdiff.
有两种输出的形式：diff和sdiff。
The patch itself is in the same diff format that CVS uses.
修补程序本身采用的格式与 CVS 所使用的diff 格式相同。
The command interactively prompts you to persist or shelve each diff.
这个命令以交互方式提示您确定是保留还是搁置各个差异。
This file is typically created with the diff utility, and is called a diff.
这个文件通常是使用diff工具创建的，因此就称为diff文件。
When you create patches in Eclipse, the patch is written in unified diff format.
在Eclipse 中创建补丁时，补丁是以统一的diff格式进行编写的。
For this, I invoke a diff tool.
为了这个目的，我使用了一个比较工具。
There's a huge diff between boys and girls sometimes.
男孩子和女孩子有时候还真有许多不同的地方。
This works virtually the same as it does with CVS. Figure 7 shows the diff function at work.
这实际上与CVS中比较功能的工作方式完全相同。
You can compare the current state of your work with the repository using BZR diff, as shown in Listing 4.
可以使用bzrdiff对比您工作的当前状态和存储库中的内容，见清单4。
Conclusion: Better understanding of the CT features of renal cystic disease may help for the diff...
结论：了解肾脏囊样病变的CT特征有利于鉴别诊断并指导临床治疗。
For example, at any given moment, you can see all the changes you have made to the code base just by typing git diff.
例如，在任何给定时刻，您都能通过键入gitdiff来查看您对代码基的所有更改。
After the XML data is indexed, you can query it quickly on subsequent searches to access data to be used in a diff process.
在XML数据被索引之后，您可以在后续的搜索中快速地查询，以访问将用在diff过程中的数据。
The diff helps you create a patch file, which is the preferred way of sending code submissions to many open source projects.
diff可以帮助我们创建补丁文件(patch file)，后者是我们向很多开放源码软件项目发送代码提交时通常使用的方法。
For a better idea of why tools like diff just aren't enough, take a look at Listing 1, which shows a simple XML document.
为了更清楚地了解为什么用象diff这样的工具比较这些XML远远不够，让我们看一下清单1，它显示了一个简单的XML文档。
Be careful with cross-axle diff locks though as, particularly on the front axle, they severely limit your ability to steer.
不过应当慎重使用轮间差速锁，尤其是前桥差速锁，因为它们会严重限制你的转向能力。
So why do I get a whole slew of responses when I use the diff command for just these two simple, nearly equivalent documents?
那么当使用diff命令来比较这两个简单的、几乎相同的文档时，为什么会得到大量的反馈结果呢？
In this example, the two substituted ls commands generate a temporary text file that is then compared inline by the diff command.
在此示例中，两个被替换的ls命令生成一个临时文本文件，然后diff命令对该文件进行内联比较。
The easiest way to do this is to run nmap, record the output, and then use a tool like diff to compare the output and report the changes.
要完成这项任务，最简单的方法是运行nmap，记录其输出，然后使用像diff这样的工具，以便对输出信息进行比较，并报告其中的更改。
Now when you generate a unified diff between the modified class and the original version of the class, your diff will look like the one in Listing 3.
现在，当您在修改后的类和类的原始版本之间生成一个统一的diff时，您的diff将如清单3中所示。
By using a regular full backup (in other words, all the files) and a diff backup where you backup only changes, you can extend the duration still further.
通过使用常规的完整备份(换句话说，包括所有的文件)和增量(diff)备份(其中仅备份变更的内容)，您可以进一步延长其保留时间。
For details on comparing XML documents, including a discussion of significant and nonsignificant whitespace, see Brett McLaughlin's tip, What's the diff?.
有关比较XML文档的详细信息，包括有意义和无意义的空白的讨论，请参阅 BrettMcLaughlin的技巧提示文章， What's the diff?。
Because between two XML documents, some differences are significant and some are not, and a diff utility isn't enough by itself to distinguish which ones matter.
这是由于在两个XML文档之间，有一些区别是重要的，而有一些则不是，但diff实用程序自身不足以区别这一点。
The code here USES a local variable diff, which is only defined within this block of code, while later in the constructor a separate variable, fill, is declared at the same level.
这里的代码使用了一个局部变量diff，这个局部变量只定义在这一块代码范围内，之后在构造函数中又声明了另一个相同级别的变量fill。
Given the temporal nature of the file system, NTT has considered some other very innovative tools for the future-for example, TLS (temporal ls), tdiff (temporal diff), and tgrep (temporal grep).
鉴于这种文件系统是临时性的，NTT已经为将来考虑了一些非常有创新性的工具—例如，tls(临时ls)、tdiff(临时diff)和tgrep(临时grep)。
Participation and acceptance will be in term of the DIFF Regulations.
参与竞赛和接受影片都将遵循DIFF条款规定。
The Diff class supports two types of comparisons: identical and similar.
Diff类支持两种比较：identical和similar。
Diff files come in several formats (see Resources to learn more about them).
diff文件有几种格式(要了解更多情况，请参见参考资料)。
For the middle omni light use the same Settings as above for both Contrast and Soften Diff. Edge but make it a pure white.
对于中间的泛光灯，使用和上面一样的对比度和柔和漫射边缘，但是颜色是纯白。
Try out XML Diff and Merge, a technology available for download free of charge from alphaWorks, with a 90-day trial license.
请尝试XMLDiff和Merge，该技术可以从alphaworks上免费下载，它有90天的试用期。
Try out XML Diff and Merge, a technology available for download free of charge from alphaWorks, with a 90-day trial license.
请尝试XMLDiff和Merge，该技术可以从alphaworks上免费下载，它有90天的试用期。
应用推荐