diff,patch

u0u0

                $ diff -u old-file new-file  > file.patch
$ diff -Nru old-dir new-dir
u表示unified格式，r表示在目录中嵌套使用
-N
       --new-file
              In directory comparison, if a file is found in only  one  direc-
              tory, treat it as present but empty in the other directory.
$ patch file-to-be-patched patch-file
$ patch -p[num] < patch-file
               
               
               
               
               

本文来自ChinaUnix博客，如果查看原文请点：http://blog.chinaunix.net/u/4774/showart_207803.html