From 2f908b22f2b7b3e2dd5760f42175958a9ad8f8b1 Mon Sep 17 00:00:00 2001 From: Benedikt Schesch Date: Mon, 20 May 2024 21:36:25 -0700 Subject: [PATCH] Style fix --- src/scripts/merge_tools/intellimerge.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/scripts/merge_tools/intellimerge.sh b/src/scripts/merge_tools/intellimerge.sh index 8298967c80..cd4585a615 100755 --- a/src/scripts/merge_tools/intellimerge.sh +++ b/src/scripts/merge_tools/intellimerge.sh @@ -37,8 +37,6 @@ java -jar "$intellimerge_absolutepath" -r "$clone_dir" -b "$branch1" "$branch2" cd "$clone_dir" || exit 1 git checkout "$branch1" --force -initial_conflict_markers=$(grep -rE '^(<<<<<<<|=======|>>>>>>>$)' "./" | wc -l) - git merge --no-edit "$branch2" cd - || exit 1