From c3601c1e2c8002c03fa486ad9507cf21fc1b413e Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Tue, 26 Jan 1999 15:02:08 +0000 Subject: [PATCH] * commit: don't mix up output from &2 and &1 when checking for conflicts --- commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commit b/commit index e3dce8259..5d3a1e348 100755 --- a/commit +++ b/commit @@ -171,7 +171,7 @@ $repeat && break $update && \ if echo "$name: checking for conflicts..." >&2 - (cvs $cvsopt -n update $updateopt ${1+"$@"} \ + (cvs $cvsopt -n update $updateopt ${1+"$@"} 2>/dev/null\ | while read line; do echo "$line" echo "$line" >&3 -- 2.47.3