Tweak

creasty · Oct 11, 2023 · a136f17 · a136f17
1 parent 7875c9a
commit a136f17
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/config/git/config b/config/git/config
@@ -9,7 +9,7 @@
 [core]
   editor = nvim
 
-  # To turn off diff-so-fancy temporarily, you can do `g --no-pager d`.
+  # To turn off diff-so-fancy temporarily, you can do `git --no-pager`.
   pager = diff-so-fancy | less --tabs=4 -RFX
 
 [color]
@@ -18,6 +18,7 @@
 [merge]
   tool = vimdiff
   ff = false
+  conflictStyle = diff3
 
 [diff]
   indentHeuristic = true