123456789101112131415161718192021 |
- [36mdiff -ru a/README b/README
- [0m[33m--- a/README 2013-02-22 20:26:43.000000000 +0800
- [0m[33m+++ b/README 2013-02-22 20:27:51.000000000 +0800
- [0m[1;34m@@ -1,6 +1,6 @@
- [0m[33m1[0m [31m# To generate expected output, c[7m[31mh[0m[31md[7m[31mir[0m[31m to a subdir and use following co[0m[1;35m>[0m [0m[33m1[0m [32m# To generate expected output, cd to a subdir and use following comma[0m[1;35m>[0m
- [33m2[0m [0m# review with `less -R`[0m [0m[33m2[0m [0m# review with `less -R`[0m
- [33m3[0m [1;31m#[0m [0m[33m [0m
- [33m4[0m [0m../../cdiff.py -c always in.diff > out.normal [0m [0m[33m3[0m [0m../../cdiff.py -c always in.diff > out.normal [0m
- [33m5[0m [0m../../cdiff.py -c always -s in.diff > out.side-by-side[0m [0m[33m4[0m [0m../../cdiff.py -c always -s in.diff > out.side-by-side[0m
- [33m6[0m [0m../../cdiff.py -c always -s in.diff -w70 > out.w70[0m [0m[33m5[0m [0m../../cdiff.py -c always -s in.diff -w70 > out.w70[0m
- [33m [0m [0m[33m6[0m [1;32m# EOF[0m
- [36mOnly in a: a1
- [0m[33m[0m[33m[0m[36mOnly in b: b1
- [0m[33m[0m[33m[0m[36mdiff -ru a/common/foo.txt b/common/foo.txt
- [0m[33m--- a/common/foo.txt 2013-02-22 20:28:32.000000000 +0800
- [0m[33m+++ b/common/foo.txt 2013-02-22 20:30:18.000000000 +0800
- [0m[1;34m@@ -1 +1 @@
- [0m[33m1[0m [31m[7m[31mHello[0m[31m[0m [0m[33m1[0m [32m[7m[32mworld[0m[32m[0m
- [36mOnly in b: date.txt
- [0m[33m[0m[33m[0m[36mOnly in a: time.txt
- [0m[33m[0m[33m[0m
|