sanchayanmaity/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

git: Use zealous diff3 style of merge conflict presentation

Browse source 
This is only available from git 2.35. A description of how this works is
in the original commit.
4496526f80
This commit is contained in:
Sanchayan Maity 2022-05-03 09:26:36 +05:30
parent a5861f627d
commit c878a7b0be
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/.gitconfig
View file

@ -27,7 +27,7 @@
cmd = kitty +kitten diff $LOCAL $REMOTE cmd = kitty +kitten diff $LOCAL $REMOTE
[merge] [merge]
tool = diffconflicts tool = diffconflicts
conflictstyle = diff3 conflictstyle = zdiff3
ff = only ff = only
[mergetool] [mergetool]
prompt = false prompt = false