Home | Mirror | Search

第 4 章 Comparison, merge and patch utilities

目錄

1. comparison, merge
2. patch - apply a diff file to an original
3. WinMerge
4. Beyond Compare Pro

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
		
comments powered by Disqus