diff

diff <变动前的文件> <变动后的文件>
diff -u file1 file2
vimdiff file1 file2



"---"表示变动前的文件,"+++"表示变动后的文件。

第二部分,变动的位置用两个@作为起首和结束。


refer to [http://www.ruanyifeng.com/blog/2012/08/how_to_read_diff.html](http://www.ruanyifeng.com/blog/2012/08/how_to_read_diff.html)
五、合并格式的diff

你可能感兴趣的:(diff)