Skip to content

Commit

Permalink
Remove output to standard error
Browse files Browse the repository at this point in the history
  • Loading branch information
mernst committed Sep 22, 2024
1 parent 1055d43 commit 324858f
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions src/scripts/merge_tools/merge_git_then_plumelib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 324858f

Please sign in to comment.