[Quilt-dev] [PATCH] test: Fix a race condition in merge.test

[Đoàn Trần Công Danh]

Just like commit 4dfe7f9, (test: Fix a race condition, 2023-01-20),
this fix a test race when stdout and stderr in any order.

Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
---
 test/merge.test | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/merge.test b/test/merge.test
index c64b33d..2e67d4f 100644
--- a/test/merge.test
+++ b/test/merge.test
@@ -39,8 +39,9 @@ Test the patch merging functionality of `quilt diff'.
        > Applying patch %{P}c.diff
        > Now at patch %{P}c.diff
 
-       $ quilt diff -P b.diff | grep -v "^\\(---\\|+++\\)"
+       $ quilt diff -P b.diff >/dev/null
        > Warning: more recent patches modify files in patch %{P}b.diff
+       $ quilt diff -P b.diff 2>/dev/null | grep -v "^\\(---\\|+++\\)"
        >~ Index: [^/]+/abc\.txt
        > ===================================================================
        > @@ -1,3 +1,3 @@
@@ -49,8 +50,9 @@ Test the patch merging functionality of `quilt diff'.
        > +b+
        >  c
 
-       $ quilt diff --combine a.diff -P b.diff | grep -v "^\\(---\\|+++\\)"
+       $ quilt diff --combine a.diff -P b.diff >/dev/null
        > Warning: more recent patches modify files in patch %{P}b.diff
+       $ quilt diff --combine a.diff -P b.diff 2>/dev/null | grep -v 
"^\\(---\\|+++\\)"
        >~ Index: [^/]+/abc\.txt
        > ===================================================================
        > @@ -1,3 +1,3 @@
-- 
2.39.2.722.g9855ee24e9