dotfiles

commit 33eaf6c1cce669a208f9a490641b9df0be044067
parent 80d66aa0f9b2ae907e865bf2b89c2c72b4e1861b
Author: Chris Bracken <chris@bracken.jp>
Date:   Tue, 20 Feb 2024 10:53:33 -0800

Set merge.conflictStyle = zdiff3

Along with ours and theirs, it includes the base version of the
differing lines.

See: https://ductile.systems/zdiff3/

Diffstat:
M
.config/git/config
 | 
1
+

1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/.config/git/config b/.config/git/config
@@ -20,6 +20,7 @@
 [grep]
   lineNumber = true
 [merge]
+  conflictStyle = zdiff3
   stat = true
 [pull]
   rebase = true