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. -# To generate expected output, chdir to a subdir and use following command, then
  6. +# To generate expected output, cd to a subdir and use following command, then
  7. # review with `less -R`
  8. -#
  9. ../../cdiff.py -c always in.diff > out.normal
  10. ../../cdiff.py -c always -s in.diff > out.side-by-side
  11. ../../cdiff.py -c always -s in.diff -w70 > out.w70
  12. +# 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. -Hello
  20. +world
  21. Only in b: date.txt
  22. Only in a: time.txt