File: out.side-by-side

package info (click to toggle)
ydiff 1.4.2-1
  • links: PTS
  • area: main
  • in suites: forky, sid, trixie
  • size: 3,692 kB
  • sloc: python: 1,417; sh: 91; makefile: 58
file content (26 lines) | stat: -rw-r--r-- 3,028 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
diff -ru a/README b/README
--- a/README	2013-02-22 20:26:43.000000000 +0800
+++ b/README	2013-02-22 20:27:51.000000000 +0800
@@ -1,6 +1,6 @@
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
2 # review with `less -R`                                                          2 # review with `less -R`
3 #   
4 ../../cdiff.py -c always in.diff > out.normal                                    3 ../../cdiff.py -c always in.diff > out.normal 
5 ../../cdiff.py -c always -s in.diff > out.side-by-side                           4 ../../cdiff.py -c always -s in.diff > out.side-by-side
6 ../../cdiff.py -c always -s in.diff -w70 > out.w70                               5 ../../cdiff.py -c always -s in.diff -w70 > out.w70
                                                                                   6 # EOF
───────────────────────────────────────────────────────────────────────────────
Only in a: a1
───────────────────────────────────────────────────────────────────────────────
Only in b: b1
───────────────────────────────────────────────────────────────────────────────
diff -ru a/common/foo.txt b/common/foo.txt
--- a/common/foo.txt	2013-02-22 20:28:32.000000000 +0800
+++ b/common/foo.txt	2013-02-22 20:30:18.000000000 +0800
@@ -1 +1 @@
1 Hello                                                                            1 world
───────────────────────────────────────────────────────────────────────────────
Only in b: date.txt
───────────────────────────────────────────────────────────────────────────────
Only in a: time.txt