Comparing and Merging Files with GNU diff and p...

Stella981
• 阅读 504

http://www.network-theory.co.uk/diff/manual/

Comparing and Merging Files with GNU diff and p...

Comparing and Merging Files with GNU diff and patch
by David MacKenzie, Paul Eggert, and Richard Stallman
Paperback (6"x9"), 120 pages
ISBN 0954161750
RRP £12.95 ($19.95)
"Well packaged... the quality of information is excellent" --- Linux User and Developer Magazine (Issue 36, Feb 2004) Get a printed copy>>>
Comparing and Merging Files with GNU diff and patch

Buy the book here! >>>
learn more

2.3 Showing Differences in Their Context
Usually, when you are looking at the differences between files, you will also want to see the parts of the files near the lines that differ, to help you understand exactly what has changed. These nearby parts of the files are called the context.

GNU diff provides two output formats that show context around the differing lines: context format and unified format. It can optionally show in which function or section of the file the differing lines are found.

If you are distributing new versions of files to other people in the form of diff output, you should use one of the output formats that show context so that they can apply the diffs even if they have made small changes of their own to the files. patch can apply the diffs in this case by searching in the files for the lines of context around the differing lines; if those lines are actually a few lines away from where the diff says they are, patch can adjust the line numbers accordingly and still apply the diff correctly. See section 10.3 Applying Imperfect Patches, for more information on using patch to apply imperfect diffs.

<<< previous table of contents next >>>

点赞
收藏
评论区
推荐文章
待兔 待兔
4个月前
手写Java HashMap源码
HashMap的使用教程HashMap的使用教程HashMap的使用教程HashMap的使用教程HashMap的使用教程22
Stella981 Stella981
3年前
Appscan的下载安装
1、下载Appscan:http://download2.boulder.ibm.com...2AppScan\_Setup.exe(https://www.oschina.net/action/GoToLink?urlhttp%3A%2F%2Fdownload2.boulder.ibm.com%2Fsar%2FCMA%2FRAA%2F00jq2
Stella981 Stella981
3年前
CodeBlocks中文版使用手册
原手册下载:http://www.codeblocks.org/docs/manual\_en.pdf(https://www.oschina.net/action/GoToLink?urlhttp%3A%2F%2Fwww.codeblocks.org%2Fdocs%2Fmanual_en.pdf)   译者:JGood(http://blog
Wesley13 Wesley13
3年前
4. Nginx模块
Nginx官方模块1.ngx\_http\_stub\_status\_modulehttp://nginx.org/en/docs/http/ngx\_http\_stub\_status\_module.html。(https://www.oschina.net/action/GoToLink?urlhttp%3A%2
Wesley13 Wesley13
3年前
P2P技术揭秘.P2P网络技术原理与典型系统开发
Modular.Java(2009.06)\.Craig.Walls.文字版.pdf:http://www.t00y.com/file/59501950(https://www.oschina.net/action/GoToLink?urlhttp%3A%2F%2Fwww.t00y.com%2Ffile%2F59501950)\More.E
Wesley13 Wesley13
3年前
Uber基于RNN的极端事件预测,解决交通问题
时间 2017061212:00:15  亿欧网(https://www.oschina.net/action/GoToLink?urlhttp%3A%2F%2Fwww.tuicool.com%2Fsites%2FAJj2Un)_原文_  http://www.iyiou.com/p/47628(https://www.oschina.n
Easter79 Easter79
3年前
Swift项目兼容Objective
!456.jpg(http://static.oschina.net/uploads/img/201509/13172704_1KcG.jpg"1433497731426906.jpg")本文是投稿文章,作者:一叶(博客(https://www.oschina.net/action/GoToLink?urlhttp%3A%2F%2F00red
Wesley13 Wesley13
3年前
NO.40 敏捷之旅2012年度成都站!
!(http://www.zentao.net/data/upload/201211/ef877fdf9d3c11093ae67415aee35b79.jpg)(https://www.oschina.net/action/GoToLink?urlhttp%3A%2F%2Fwww.zentao.net%2Fdata%2Fupload%2F20121
Wesley13 Wesley13
3年前
Unity Glossary
https://docs.unity3d.com/2018.4/Documentation/Manual/Glossary.html(https://www.oschina.net/action/GoToLink?urlhttps%3A%2F%2Fdocs.unity3d.com%2F2018.4%2FDocumentation%2FManual%2F
Wesley13 Wesley13
3年前
Java 面向对象 之 方法中内部类
<ahref"http://www.verejava.com/?id16992857876159"http://www.verejava.com/?id16992857876159(https://www.oschina.net/action/GoToLink?urlhttp%3A%2F%2Fwww.verejava.com%2F%3Fid%