ivuorinen/dotfiles
1
0
Fork 0
mirror of https://github.com/ivuorinen/dotfiles.git synced 2026-01-26 11:14:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(config): change git merge conflictStyle

Browse Source
This commit is contained in:
Ismo Vuorinen
2025-05-16 21:50:29 +03:00
parent ccc5903290
commit 923f881725
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/git/config
View File

@@ -46,7 +46,7 @@
autoStash = true
updateRefs = true
[merge]
conflictstyle = zdiff3
conflictStyle = diff3
[pull]
rebase = true
[color "diff-highlight"]