druckdev/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git: Set merge.conflictstyle to diff3

Browse Source 
Display original text in addition to changes from both sides.
This commit is contained in:
Julian Prein
2024-09-21 00:03:34 +02:00
parent ea2a02626d
commit d30b102e42
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.config/git/config
View File

@@ -87,6 +87,7 @@
[log] [log]
follow = true follow = true
[merge] [merge]
conflictstyle = diff3
log = true log = true
suppressDest = * suppressDest = *
[pretty] [pretty]