Skip to content

Commit

Permalink
Check if merge driver is present
Browse files Browse the repository at this point in the history
  • Loading branch information
benedikt-schesch committed Apr 29, 2024
1 parent 39b8fe9 commit dcc716a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ merge_drivers=$(git config --local --get-regexp '^merge\..*\.driver$')
if [ ! -z "$merge_drivers" ]; then
echo "Error: Custom merge drivers are set in global configuration."
echo "Please unset them before running the evaluation."
echo "$merge_drivers"
echo "Merge driver found: $merge_drivers"
exit 1
fi

Expand Down

0 comments on commit dcc716a

Please sign in to comment.