Skip to content

Commit

Permalink
mergiraf_absolutepath is a variable that holds a path, not a command …
Browse files Browse the repository at this point in the history
…that yields a path
  • Loading branch information
mernst committed Nov 14, 2024
1 parent 4b2708f commit bb24ded
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/scripts/merge_tools/mergiraf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ cd "$clone_dir" || { echo "$0: cannot cd to $clone_dir"; exit 2; }
# set up mergiraf driver
git config --local merge.mergiraf.name mergiraf
git config --local merge.mergiraf.driver "${mergiraf_absolutepath} merge --git %O %A %B -s %S -x %X -y %Y -p %P"
$(mergiraf_absolutepath) languages --gitattributes >> .gitattributes
$mergiraf_absolutepath languages --gitattributes >> .gitattributes

# perform merge
git checkout "$branch1" --force
Expand Down

0 comments on commit bb24ded

Please sign in to comment.