git: remove conflictstyle = diff3
Prithu Goswami pg@prithu.dev
Mon, 12 Jun 2023 14:53:25 +0530
1 files changed,
2 insertions(+),
2 deletions(-)
jump to
M
home/.gitconfig
→
home/.gitconfig
@@ -34,8 +34,8 @@
[delta] navigate = true # use n and N to move between diff sections -[merge] - conflictstyle = diff3 +; [merge] +; conflictstyle = diff3 [diff] colorMoved = default