chore(config): change git merge conflictStyle

chore(config): updated zed settings
Signed-off-by: Ismo Vuorinen <ismo@ivuorinen.net>
2026-01-29 15:46:07 +00:00 · 2025-05-16 21:50:29 +03:00 · 2025-05-16 21:49:55 +03:00
2 changed files with 2 additions and 2 deletions
--- a/config/git/config
+++ b/config/git/config
@@ -46,7 +46,7 @@
 	autoStash = true
 	updateRefs = true
 [merge]
-	conflictstyle = zdiff3
+	conflictStyle = diff3
 [pull]
 	rebase = true
 [color "diff-highlight"]
--- a/config/zed/settings.json
+++ b/config/zed/settings.json
@@ -6,7 +6,7 @@
    "always_allow_tool_actions": false,
    "default_model": {
      "provider": "copilot_chat",
-      "model": "gpt-4o"
+      "model": "gpt-4.1"
    },
    "version": "2"
  },
Author	SHA1	Message	Date
Ismo Vuorinen	923f881725	chore(config): change git merge conflictStyle	2025-05-16 21:50:29 +03:00
Ismo Vuorinen	ccc5903290	chore(config): updated zed settings Signed-off-by: Ismo Vuorinen <ismo@ivuorinen.net>	2025-05-16 21:49:55 +03:00