Skip to content

Commit

Permalink
Correct order of arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
@mernst
mernst committed Sep 22, 2024
1 parent cd2cfe8 commit 0f84f17
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/scripts/merge_tools/merge_git_then_plumelib.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ fi

git config --local merge.tool merge-plumelib
# shellcheck disable=SC2016
git config --local mergetool.merge-plumelib.cmd 'java-merge-tool.sh '"$plumelib_strategy"' ${BASE} ${LOCAL} ${REMOTE} ${MERGED}'
git config --local mergetool.merge-plumelib.cmd 'java-merge-tool.sh '"$plumelib_strategy"' ${LOCAL} ${BASE} ${REMOTE} ${MERGED}'
git config --local mergetool.merge-plumelib.trustExitCode true

case "$plumelib_strategy" in
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/merge_tools/merge_script_then_plumelib.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ fi

git config --local merge.tool merge-plumelib
# shellcheck disable=SC2016
git config --local mergetool.merge-plumelib.cmd 'java-merge-tool.sh '"$plumelib_strategy"' ${BASE} ${LOCAL} ${REMOTE} ${MERGED}'
git config --local mergetool.merge-plumelib.cmd 'java-merge-tool.sh '"$plumelib_strategy"' ${LOCAL} ${BASE} ${REMOTE} ${MERGED}'
git config --local mergetool.merge-plumelib.trustExitCode true

case "$plumelib_strategy" in
Expand Down

0 comments on commit 0f84f17

Please sign in to comment.