From 9c657138cf7bd05464fbbac979d8b25df567dcd0 Mon Sep 17 00:00:00 2001 From: Benedikt Schesch Date: Mon, 27 May 2024 13:42:52 -0700 Subject: [PATCH] Style fix --- src/scripts/merge_tools/merge_plumelib.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scripts/merge_tools/merge_plumelib.sh b/src/scripts/merge_tools/merge_plumelib.sh index 7d380635fa..a95ae6f981 100755 --- 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