reverted changes

benedikt-schesch · Sep 17, 2024 · f350c1c · f350c1c
1 parent 9105f33
commit f350c1c
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/scripts/merge_tools/plumelib_adjacent.sh b/src/scripts/merge_tools/plumelib_adjacent.sh
@@ -7,5 +7,7 @@ clone_dir=$1
 branch1=$2
 branch2=$3
 git_strategy="-s ort"
+# Uses both --adjacent and all of plume-lib merging's default behaviors.
+# Thus, this implements "adjacent + plume-lib-merging-fixups".
 plumelib_strategy="--adjacent"
 "$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"