Add default gitconfig

config/wezterm/wezterm.lua

@@ -2,12 +2,27 @@ local wezterm = require("wezterm")
 local config = {}
 local act = wezterm.action
 local os_name = os.getenv("OS")
+<<<<<<< Updated upstream
+||||||| Stash base
+=======
 
 if os_name and os_name:lower():find("windows") then
 	config.default_prog = { "pwsh.exe" }
 else
 	config.default_prog = { "/usr/bin/fish" }
 end
+>>>>>>> Stashed changes
+
+<<<<<<< Updated upstream
+if os_name and os_name:lower():find("windows") then
+	config.default_prog = { "pwsh.exe" }
+else
+	config.default_prog = { "/usr/bin/fish" }
+end
+||||||| Stash base
+config.default_prog = { "/usr/bin/fish" }
+=======
+>>>>>>> Stashed changes
 config.default_cwd = "~"
 config.initial_rows = 36
 config.initial_cols = 132