diff patch

diff 两个目录

diff -ruNa xx xxx >x.patch

patch xx 到xxx（叫xxx内容和xx一样）

cd xxx
patch  -p1<../x.patch 

扫描二维码关注公众号，回复： 1242159 查看本文章

回复xxx 到原来

cd xxx
patch  -R -p1<../x.patch