123456789101112131415161718192021
  1. diff -ru a/README b/README
  2. --- a/README 2013-02-22 20:26:43.000000000 +0800
  3. +++ b/README 2013-02-22 20:27:51.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. Only in a: a1
  13. Only in b: b1
  14. diff -ru a/common/foo.txt b/common/foo.txt
  15. --- a/common/foo.txt 2013-02-22 20:28:32.000000000 +0800
  16. +++ b/common/foo.txt 2013-02-22 20:30:18.000000000 +0800
  17. @@ -1 +1 @@
  18. 1 Hello 1 world
  19. Only in b: date.txt
  20. Only in a: time.txt
  21.