Added latest info

benedikt-schesch · May 27, 2024 · f302562 · f302562
1 parent 042c3f5
commit f302562
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/src/scripts/merge_tools/merge_plumelib.sh b/src/scripts/merge_tools/merge_plumelib.sh
@@ -21,7 +21,7 @@ git config --local merge.tool merge-plumelib
 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
 
-git merge --no-edit "$strategy" "$branch2"
+git merge --no-edit "$git_strategy" "$branch2"
 retVal=$?
 
 # report conflicts

diff --git a/src/scripts/merge_tools/plumelib_ort.sh b/src/scripts/merge_tools/plumelib_ort.sh
@@ -8,4 +8,4 @@ branch1=$2
 branch2=$3
 git_strategy="-s ort"
 plumelib_strategy=""
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy" "$plumelib_strategy"
+"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"
diff --git a/src/scripts/merge_tools/plumelib_ort_adjacent.sh b/src/scripts/merge_tools/plumelib_ort_adjacent.sh
@@ -8,4 +8,4 @@ branch1=$2
 branch2=$3
 git_strategy="-s ort"
 plumelib_strategy="--only-adjacent"
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy" "$plumelib_strategy"
+"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"
diff --git a/src/scripts/merge_tools/plumelib_ort_adjacent_ignorespace.sh b/src/scripts/merge_tools/plumelib_ort_adjacent_ignorespace.sh
@@ -8,4 +8,4 @@ branch1=$2
 branch2=$3
 git_strategy="-s ort -Xignore-space-change"
 plumelib_strategy="--only-adjacent"
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy" "$plumelib_strategy"
+"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"
diff --git a/src/scripts/merge_tools/plumelib_ort_ignorespace.sh b/src/scripts/merge_tools/plumelib_ort_ignorespace.sh
@@ -8,4 +8,4 @@ branch1=$2
 branch2=$3
 git_strategy="-s ort -Xignore-space-change"
 plumelib_strategy=""
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy" "$plumelib_strategy"
+"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"
diff --git a/src/scripts/merge_tools/plumelib_ort_imports.sh b/src/scripts/merge_tools/plumelib_ort_imports.sh
@@ -8,4 +8,4 @@ branch1=$2
 branch2=$3
 git_strategy="-s ort"
 plumelib_strategy="--only-imports"
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy" "$plumelib_strategy"
+"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"
diff --git a/src/scripts/merge_tools/plumelib_ort_imports_ignorespace.sh b/src/scripts/merge_tools/plumelib_ort_imports_ignorespace.sh
@@ -8,4 +8,4 @@ branch1=$2
 branch2=$3
 git_strategy="-s ort -Xignore-space-change"
 plumelib_strategy="--only-imports"
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy" "$plumelib_strategy"
+"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"
diff --git a/src/scripts/merge_tools/plumelib_ort_version_number.sh b/src/scripts/merge_tools/plumelib_ort_version_number.sh
@@ -8,4 +8,4 @@ branch1=$2
 branch2=$3
 git_strategy="-s ort"
 plumelib_strategy="--only-version-numbers"
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy" "$plumelib_strategy"
+"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"
diff --git a/src/scripts/merge_tools/plumelib_ort_version_number_ignorespace.sh b/src/scripts/merge_tools/plumelib_ort_version_number_ignorespace.sh
@@ -8,4 +8,4 @@ branch1=$2
 branch2=$3
 git_strategy="-s ort -Xignore-space-change"
 plumelib_strategy="--only-version-numbers"
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy" "$plumelib_strategy"
+"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"