~sanchayanmaity/dotfiles

c878a7b0be91d3a6204eb76b5d15aa6194809275 — Sanchayan Maity a month ago a5861f6
git: Use zealous diff3 style of merge conflict presentation

This is only available from git 2.35. A description of how this works is
in the original commit.
https://github.com/git/git/commit/4496526f80b3e4952036550b279eff8d1babd60a
1 files changed, 1 insertions(+), 1 deletions(-)

M git/.gitconfig
M git/.gitconfig => git/.gitconfig +1 -1
@@ 27,7 27,7 @@
    cmd = kitty +kitten diff $LOCAL $REMOTE
[merge]
	tool = diffconflicts
	conflictstyle = diff3
	conflictstyle = zdiff3
	ff = only
[mergetool]
	prompt = false