diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2004-07-04 02:42:40 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2004-07-04 02:42:40 +0000 |
| commit | 4d61bdf5dcfb6fabc1bb0a3ef72dd5c13c370db6 (patch) | |
| tree | d9d0a3fc845e8d1855ba0206780ddcde10f40d3e /test/merge.test | |
| parent | 00227c3952cd1618d0bd6a6a2231046b3153c14e (diff) | |
| download | quilt-4d61bdf5dcfb6fabc1bb0a3ef72dd5c13c370db6.tar.gz | |
- Add common GNU Diff format options to diff and refresH commands:
-u, -U num, -c, -C num. REname old -c option (combine patches)
of diff command to --combine.
- Extend the function that splits comments froM patches and
syntax coloring to handLe combined diff format.
- Honor the LAnG environment variable again; this goT broken at
some point.
- Set TEXTDOMAINDIR to where the translations are put so that
Messages are found even when not installing into /usr.
Diffstat (limited to 'test/merge.test')
| -rw-r--r-- | test/merge.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/merge.test b/test/merge.test index 27dcd34..21799cd 100644 --- a/test/merge.test +++ b/test/merge.test @@ -51,7 +51,7 @@ Test the patch merging functionality of `quilt diff'. > c > More recent patches modify files in b.diff. - $ quilt diff -c a.diff -P b.diff | grep -v "^\\(---\\|+++\\)" + $ quilt diff --combine a.diff -P b.diff | grep -v "^\\(---\\|+++\\)" > Index: d/abc.txt > =================================================================== > @@ -1,3 +1,3 @@ @@ -62,7 +62,7 @@ Test the patch merging functionality of `quilt diff'. > c > More recent patches modify files in b.diff. - $ quilt diff -c b.diff | grep -v "^\\(---\\|+++\\)" + $ quilt diff --combine b.diff | grep -v "^\\(---\\|+++\\)" > Index: d/abc.txt > =================================================================== > @@ -1,3 +1,3 @@ @@ -72,7 +72,7 @@ Test the patch merging functionality of `quilt diff'. > +b+ > +c+ - $ quilt diff -c - | grep -v "^\\(---\\|+++\\)" + $ quilt diff --combine - | grep -v "^\\(---\\|+++\\)" > Index: d/abc.txt > =================================================================== > @@ -1,3 +1,3 @@ |