Git: mergetool, autoSetupRemote

.gitconfig

@@ -19,11 +19,12 @@
     user = rad4day
 [pull]
     rebase = true
+[push]
+    autoSetupRemote = true
 [interactive]
     diffFilter = delta --color-only
 [delta]
     features = line-numbers decorations
-    syntax-theme = OneHalfDark
     whitespace-error-style = 22 reverse
 [delta "decorations"]
     commit-decoration-style = bold yellow box ul
@@ -37,3 +38,5 @@
 	defaultBranch = main
 [diff "dyff"]
 	command = "dyff_between() { dyff --color on between --omit-header \"$2\" \"$5\"; }; dyff_between"
+[merge]
+	tool = smerge