12345678910111213141516171819202122
  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 com 1 # To generate expected output, cd to a subdir and use following comman
  6.   mand, then   d, then
  7. 2 # review with `less -R` 2 # review with `less -R`
  8. 3 #  
  9. 4 ../../cdiff.py -c always in.diff > out.normal  3 ../../cdiff.py -c always in.diff > out.normal 
  10. 5 ../../cdiff.py -c always -s in.diff > out.side-by-side 4 ../../cdiff.py -c always -s in.diff > out.side-by-side
  11. 6 ../../cdiff.py -c always -s in.diff -w70 > out.w70 5 ../../cdiff.py -c always -s in.diff -w70 > out.w70
  12.   6 # EOF
  13. Only in a: a1
  14. Only in b: b1
  15. diff -ru a/common/foo.txt b/common/foo.txt
  16. --- a/common/foo.txt 2013-02-22 20:28:32.000000000 +0800
  17. +++ b/common/foo.txt 2013-02-22 20:30:18.000000000 +0800
  18. @@ -1 +1 @@
  19. 1 Hello 1 world
  20. Only in b: date.txt
  21. Only in a: time.txt
  22.