diff options
Diffstat (limited to 'test/merge.test')
| -rw-r--r-- | test/merge.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/merge.test b/test/merge.test index b50495d..a3fa679 100644 --- a/test/merge.test +++ b/test/merge.test @@ -42,7 +42,7 @@ Test the patch merging functionality of `quilt diff'. > Now at patch %{P}c.diff $ quilt diff -P b.diff | grep -v "^\\(---\\|+++\\)" - > More recent patches modify files in patch %{P}b.diff + > Warning: more recent patches modify files in patch %{P}b.diff > Index: d/abc.txt > =================================================================== > @@ -1,3 +1,3 @@ @@ -52,7 +52,7 @@ Test the patch merging functionality of `quilt diff'. > c $ quilt diff --combine a.diff -P b.diff | grep -v "^\\(---\\|+++\\)" - > More recent patches modify files in patch %{P}b.diff + > Warning: more recent patches modify files in patch %{P}b.diff > Index: d/abc.txt > =================================================================== > @@ -1,3 +1,3 @@ |