From 324858fe5bd6034bc44dc87d8848d213bf71ca4f Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Sat, 21 Sep 2024 19:35:00 -0700 Subject: [PATCH] Remove output to standard error --- src/scripts/merge_tools/merge_git_then_plumelib.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/scripts/merge_tools/merge_git_then_plumelib.sh b/src/scripts/merge_tools/merge_git_then_plumelib.sh index 11e3bd5a8b..62d8561d99 100755 --- a/src/scripts/merge_tools/merge_git_then_plumelib.sh +++ b/src/scripts/merge_tools/merge_git_then_plumelib.sh @@ -75,10 +75,8 @@ esac if [ -n "$VERBOSE" ] ; then echo "$0: about to run: git-mergetool.sh $all_arg --tool=merge-plumelib in $(pwd)" - echo "$0: about to run: git-mergetool.sh $all_arg --tool=merge-plumelib in $(pwd)" >&2 git-mergetool.sh --verbose $all_arg --tool=merge-plumelib echo "$0: ran: git-mergetool.sh $all_arg --tool=merge-plumelib in $(pwd)" - echo "$0: ran: git-mergetool.sh $all_arg --tool=merge-plumelib in $(pwd)" >&2 else git-mergetool.sh $all_arg --tool=merge-plumelib fi