diff options
Diffstat (limited to '')
| -rw-r--r-- | contrib/gdiffmk/tests/baseline | 17 | ||||
| -rw-r--r-- | contrib/gdiffmk/tests/baseline.10 | 26 | ||||
| -rw-r--r-- | contrib/gdiffmk/tests/baseline.6 | 17 | ||||
| -rw-r--r-- | contrib/gdiffmk/tests/baseline.6a | 17 | ||||
| -rw-r--r-- | contrib/gdiffmk/tests/baseline.7 | 2 | ||||
| -rw-r--r-- | contrib/gdiffmk/tests/baseline.8 | 26 | ||||
| -rw-r--r-- | contrib/gdiffmk/tests/baseline.9 | 26 | ||||
| -rw-r--r-- | contrib/gdiffmk/tests/baseline.9a | 26 |
8 files changed, 157 insertions, 0 deletions
diff --git a/contrib/gdiffmk/tests/baseline b/contrib/gdiffmk/tests/baseline new file mode 100644 index 0000000..6b32992 --- /dev/null +++ b/contrib/gdiffmk/tests/baseline @@ -0,0 +1,17 @@ +.ll 25 +.pl 20 +.nf +file1 and file2 #1 +.mc | +file2 only +file2 only +.mc +file1 and file2 #2 +.mc + +file2 only +.mc +file1 and file2 #3 +.mc * +.mc +file1 and file2 #4 +file1 and file2 #5 diff --git a/contrib/gdiffmk/tests/baseline.10 b/contrib/gdiffmk/tests/baseline.10 new file mode 100644 index 0000000..b523f45 --- /dev/null +++ b/contrib/gdiffmk/tests/baseline.10 @@ -0,0 +1,26 @@ +.ll 25 +.pl 20 +.nf +file1 and file2 #1 +[[ +file1 only +]] +. +.mc | +file2 only +file2 only +.mc +file1 and file2 #2 +.mc + +file2 only +.mc +file1 and file2 #3 +[[ +file1 only +file1 only +]] +. +.mc * +.mc +file1 and file2 #4 +file1 and file2 #5 diff --git a/contrib/gdiffmk/tests/baseline.6 b/contrib/gdiffmk/tests/baseline.6 new file mode 100644 index 0000000..3156961 --- /dev/null +++ b/contrib/gdiffmk/tests/baseline.6 @@ -0,0 +1,17 @@ +.ll 25 +.pl 20 +.nf +file1 and file2 #1 +.mc C +file2 only +file2 only +.mc +file1 and file2 #2 +.mc A +file2 only +.mc +file1 and file2 #3 +.mc D +.mc +file1 and file2 #4 +file1 and file2 #5 diff --git a/contrib/gdiffmk/tests/baseline.6a b/contrib/gdiffmk/tests/baseline.6a new file mode 100644 index 0000000..3156961 --- /dev/null +++ b/contrib/gdiffmk/tests/baseline.6a @@ -0,0 +1,17 @@ +.ll 25 +.pl 20 +.nf +file1 and file2 #1 +.mc C +file2 only +file2 only +.mc +file1 and file2 #2 +.mc A +file2 only +.mc +file1 and file2 #3 +.mc D +.mc +file1 and file2 #4 +file1 and file2 #5 diff --git a/contrib/gdiffmk/tests/baseline.7 b/contrib/gdiffmk/tests/baseline.7 new file mode 100644 index 0000000..4a83af6 --- /dev/null +++ b/contrib/gdiffmk/tests/baseline.7 @@ -0,0 +1,2 @@ +gdiffmk: The FILE2 and OUTPUT arguments both point to the same file, +gdiffmk: './contrib/gdiffmk/tests/tmp_file.7', and it would be overwritten. diff --git a/contrib/gdiffmk/tests/baseline.8 b/contrib/gdiffmk/tests/baseline.8 new file mode 100644 index 0000000..9846dd5 --- /dev/null +++ b/contrib/gdiffmk/tests/baseline.8 @@ -0,0 +1,26 @@ +.ll 25 +.pl 20 +.nf +file1 and file2 #1 +[[ +file1 only +]] +.br +.mc | +file2 only +file2 only +.mc +file1 and file2 #2 +.mc + +file2 only +.mc +file1 and file2 #3 +[[ +file1 only +file1 only +]] +.br +.mc * +.mc +file1 and file2 #4 +file1 and file2 #5 diff --git a/contrib/gdiffmk/tests/baseline.9 b/contrib/gdiffmk/tests/baseline.9 new file mode 100644 index 0000000..50fe57d --- /dev/null +++ b/contrib/gdiffmk/tests/baseline.9 @@ -0,0 +1,26 @@ +.ll 25 +.pl 20 +.nf +file1 and file2 #1 +<<<< +file1 only +>>>> +.br +.mc | +file2 only +file2 only +.mc +file1 and file2 #2 +.mc + +file2 only +.mc +file1 and file2 #3 +<<<< +file1 only +file1 only +>>>> +.br +.mc * +.mc +file1 and file2 #4 +file1 and file2 #5 diff --git a/contrib/gdiffmk/tests/baseline.9a b/contrib/gdiffmk/tests/baseline.9a new file mode 100644 index 0000000..50fe57d --- /dev/null +++ b/contrib/gdiffmk/tests/baseline.9a @@ -0,0 +1,26 @@ +.ll 25 +.pl 20 +.nf +file1 and file2 #1 +<<<< +file1 only +>>>> +.br +.mc | +file2 only +file2 only +.mc +file1 and file2 #2 +.mc + +file2 only +.mc +file1 and file2 #3 +<<<< +file1 only +file1 only +>>>> +.br +.mc * +.mc +file1 and file2 #4 +file1 and file2 #5 |