From 1469c87577db7185334765517eed97ae01ca1f71 Mon Sep 17 00:00:00 2001 From: Benedikt Schesch Date: Mon, 6 May 2024 18:43:45 -0700 Subject: [PATCH] Spork update --- src/scripts/merge_tools/spork.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/scripts/merge_tools/spork.sh b/src/scripts/merge_tools/spork.sh index 2753140916..e526003494 100755 --- 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