linux diff 与 patch

linux:/usr/local/ntp/bin # vi expatch.old
linux:/usr/local/ntp/bin # vi expatch.new
linux:/usr/local/ntp/bin # diff expatch.old expatch.new
2c2
< echo "postmap -q - regexp:header_checks < header_checks"
---
> echo "postmap -q - regexp:header_checks < header_checks This's right"
4c4
< echo "postmap -q - regexp:body_checks < body_checks"
---
> echo "postmap -q - regexp:body_checks < body_checks This's right"

***expatch.old 2011-03-16
---expatch.new 2011-03-16
2c2
<echo "postmap -q - regexp:header_checks < header_checks"
---
> echo "postmap -q - regexp:header_checks < header_checks This's right"
4c4
< echo "postmap -q - regexp:body_checks < body_checks"
---
> echo "postmap -q - regexp:body_checks < body_checks This's right"   

patch -p0 < expatch.patch

posted @ 2011-03-16 17:41  nodot  阅读(302)  评论(0)    收藏  举报