diff --git a/src/scripts/merge_tools/mergiraf.sh b/src/scripts/merge_tools/mergiraf.sh index ecc689d20a..e5e558380b 100755 --- a/src/scripts/merge_tools/mergiraf.sh +++ b/src/scripts/merge_tools/mergiraf.sh @@ -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