Spork update

benedikt-schesch · May 7, 2024 · 1469c87 · 1469c87
1 parent 379cbd0
commit 1469c87
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/scripts/merge_tools/spork.sh b/src/scripts/merge_tools/spork.sh
@@ -27,9 +27,9 @@ branch1=$2
 branch2=$3
 
 # set up spork driver
-(echo "[merge \"spork\"]";
-    echo "    name = spork";
-    echo "    driver = java -jar $spork_absolutepath --git-mode %A %O %B -o %A") >> "$clone_dir/.git/config"
+git config --local merge.spork.name "spork"
+git config --local merge.spork.driver "java -jar $spork_absolutepath --git-mode %A %O %B -o %A"
+
 echo "*.java merge=spork" >> "$clone_dir/.gitattributes"
 
 # perform merge