out.side-by-side 1.7KB

123456789101112131415161718
  1. diff -ru a/README b/README
  2. --- a/README 2013-02-23 19:51:41.000000000 +0800
  3. +++ b/README 2013-02-23 19:52:06.000000000 +0800
  4. @@ -1,6 +1,6 @@
  5. 1 # To generate expected output, chdir to a subdir and use following command, then 1 # To generate expected output, cd to a subdir and use following command, then
  6. 2 # review with `less -R` 2 # review with `less -R`
  7. 3 #  
  8. 4 ../../cdiff.py -c always < in.diff > out.normal 3 ../../cdiff.py -c always < in.diff > out.normal
  9. 5 ../../cdiff.py -c always -s < in.diff > out.side-by-side 4 ../../cdiff.py -c always -s < in.diff > out.side-by-side
  10. 6 ../../cdiff.py -c always -s < in.diff -w70 > out.w70 5 ../../cdiff.py -c always -s < in.diff -w70 > out.w70
  11.   6 # EOF
  12. Binary files a/foo.pdf and b/foo.pdf differ
  13. diff -ru a/foo.txt b/foo.txt
  14. --- a/foo.txt 2013-02-23 19:55:03.000000000 +0800
  15. +++ b/foo.txt 2013-02-23 19:55:10.000000000 +0800
  16. @@ -1,2 +1,2 @@
  17. 1 Hello 1 hella
  18. 2 world 2 world