update

brew.sh

@@ -142,6 +142,8 @@ brew install --cask monitorcontrol
 # brew install --cask loom
 brew install --cask cameracontroller logitech-camera-settings
 brew install --cask launchcontrol
+brew install dark-mode
+curl -OL $(curl --silent https://su.darkmodebuddy.app/appcast.xml | xq -r '.rss.channel.item.enclosure."@url"') && open DarkModeBuddy*.dmg
 
 brew install --cask font-smoothing-adjuster
 brew tap homebrew/cask-fonts

gitconfig

@@ -153,7 +153,7 @@
  tool = vscode
  # tool = meld
  # tool = meld_merged
- conflictstyle = diff3
+ # conflictstyle = diff3
 [rerere]
  enabled = 1
 [mergetool "diffuse_custom"]
@@ -219,7 +219,7 @@
  name = automatically merge npm lockfiles
  driver = npx npm-merge-driver merge %A %O %B %P
 [mergetool "vscode"]
- cmd = code --wait \"$MERGED\"
+ cmd = code --wait --merge \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"
 [commit]
  # template = /Users/emilyklassen/.stCommitMsg
 [pull]