.gitconfig merge.conflictstyle=diff3
dblume

dblume commited on 2022-12-15 01:09:23
Showing 1 changed files, with 1 additions and 0 deletions.

... ...
@@ -25,5 +25,6 @@
25 25
 	prune = true
26 26
 [merge]
27 27
 	tool = vimdiff
28
+	conflictstyle = diff3
28 29
 [include]
29 30
 	path = ~/.gitconfig.local
30 31