diff文件差异，patch修复文件差异

$ vim fruit1.txt
apple
banana
pear
blueberry

$ vim fruit2.txt
apple
orange
pear
these are all fruits


$ diff -u fruit1.txt fruit2.txt > fruit.patch          #生成差异文件，输出到fruit.patch文件
$ cat fruit.patch
--- fruit1.txt    2013-07-18 23:16:33.659352133 +0800
+++ fruit2.txt    2013-07-18 23:20:57.219014695 +0800
@@ -1,4 +1,4 @@
 apple
-banana
+orange
 pear
-blueberry
+these are all fruits

$ patch -p2 fruit2.txt < fruit.patch        #修复文件2
patching file fruit2.txt
Reversed (or previously applied) patch detected!  Assume -R? [n] y

$ cat fruit2.txt
apple
banana
pear
blueberry

来自 “ ITPUB博客 ” ，链接：http://blog.itpub.net/29038506/viewspace-766648/，如需转载，请注明出处，否则将追究法律责任。

转载于:http://blog.itpub.net/29038506/viewspace-766648/