l-x/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change git conflict style to zdiff3

Browse source 
Signed-off-by: forge <forge@pnyhf.eu>
This commit is contained in:
Alex 2024-02-24 10:40:19 +01:00 committed by forge
parent 9cab32a820
commit 4cd5653ae4
Signed by: forge
GPG key ID: 17FE503EE0CDB8F6
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
git/config
View file

@ -78,7 +78,7 @@
fsckobjects = true fsckobjects = true
[merge] [merge]
conflictstyle = diff3 conflictstyle = zdiff3
[diff] [diff]
algorithm = histogram algorithm = histogram