Style fix

benedikt-schesch · May 27, 2024 · 9c65713 · 9c65713
1 parent 43fa549
commit 9c65713
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/scripts/merge_tools/merge_plumelib.sh b/src/scripts/merge_tools/merge_plumelib.sh
@@ -18,6 +18,7 @@ git checkout "$branch1" --force
 git config --local merge.conflictstyle diff3
 git config --local mergetool.prompt false
 git config --local merge.tool merge-plumelib
+# shellcheck disable=SC2016
 git config --local mergetool.merge-plumelib.cmd 'java-merge-tool.sh '"$merge_strategy"' ${BASE} ${LOCAL} ${REMOTE} ${MERGED}'
 git config --local mergetool.merge-plumelib.trustExitCode true