From f350c1c227a29973fd062d228caa12cc9eb5a685 Mon Sep 17 00:00:00 2001
From: Benedikt Schesch <b.schesch@gmail.com>
Date: Tue, 17 Sep 2024 00:42:03 -0700
Subject: [PATCH] reverted changes

---
 src/scripts/merge_tools/plumelib_adjacent.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/scripts/merge_tools/plumelib_adjacent.sh b/src/scripts/merge_tools/plumelib_adjacent.sh
index 9cca1ab1a9..adb0478df2 100755
--- 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"