Home | 简体中文 | 繁体中文 | 杂文 | 打赏(Donations) | ITEYE 博客 | OSChina 博客 | Facebook | Linkedin | 知乎专栏 | Search | Email

第 3 章 Comparison, merge and patch utilities

目录

3.1. comparison, merge
3.2. patch - apply a diff file to an original
3.3. WinMerge
3.4. Beyond Compare Pro

3.1. comparison, merge

sdiff

neo@netkiller:/tmp$ sdiff file1 file2
#!/bin/bash                                                     #!/bin/bash
echo "Helloworld"                                             | echo "Helloword"
echo "Line 1"                                                   echo "Line 1"
		

vimdiff

$ vimdiff file1 file2