diff options
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 @@ |