diff和patch

diff file.old file.new > file.patch

patch file.old < file.patch

diff -ruN dir.old dir.new > dir.patch

patch -p1 < ../dir.patch

参考页面：

• 善用diff和patch
• 学习使用diff,patch