Added zdiff3

benedikt-schesch · Oct 4, 2023 · 2bf17f8 · 2bf17f8
1 parent 4aafb5c
commit 2bf17f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/scripts/merge_tools/git_hires_merge.sh b/src/scripts/merge_tools/git_hires_merge.sh
@@ -14,7 +14,7 @@ export GIT_HIRES_MERGE_NON_INTERACTIVE_MODE=True
 attributes_file=".git/info/attributes"
 echo "* merge=git-hires-merge" >> "$attributes_file"
 
-
+git config merge.conflictStyle zdiff3
 git merge --no-edit "$branch2" 
 retVal=$?
 

diff --git a/src/scripts/merge_tools/gitmerge.sh b/src/scripts/merge_tools/gitmerge.sh
@@ -21,7 +21,10 @@ strategy=$4
 
 # perform merge
 cd "$clone_dir" || exit 1
+
 git checkout "$branch1" --force
+git config merge.conflictstyle zdiff3
+
 echo "Running: git merge --no-edit $strategy $branch2"
 # shellcheck disable=SC2086
 git merge --no-edit $strategy "$branch2"