* commit: don't mix up output from &2 and &1 when checking

for conflicts

diff --git a/commit b/commit
index e3dce8259b7b581b885de909a624560e0f96f0ff..5d3a1e34812e55b4e55bf2ff0ca36659e6e8a221 100755 (executable)
--- 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