zdiff3 is da best. for llm calls dont continue

Author: paulirish

.gitconfig

@@ -70,7 +70,7 @@
 	pager = delta
 
 [delta]
-	max-line-length = 700
+	max-line-length = 1400
 	# max-line-distance = 0.3 # better word-diff?
 	syntax-theme = base16
 	hyperlinks = true # i filed https://github.com/dandavison/delta/issues/362 but in 2022 i can't see brokenness in the issue nor repro weirdness. but i installed latest `less` anyway
@@ -141,7 +141,7 @@
 [merge]
 	tool = opendiff
 	renameLimit = 0
-	# still evaluating if i prefer this 3 item conflict dealio....
+	# This 3-item conflict style is MUCH better.
 	conflictstyle = zdiff3
 
 

fish/aliases.fish

@@ -148,7 +148,7 @@ function gemi
   #    gemi "tell me a joke"
   if test -z "$argv[1]"
     # no markdown parsing here without some real fancy stuff. because you dont want to send to markdown renderer (glow) inbetween backticks, etc.
-    llm chat --continue -m gemini-2.5-flash
+    llm chat -m gemini-2.5-flash
   else
     llm prompt -m gemini-2.5-flash "$argv" && echo "⬇️… and now rendered…⬇️" && llm logs -r | glow
   end
@@ -157,7 +157,7 @@ end
 function openai
   # using llm. same dealio as above
   if test -z "$argv[1]"
-    llm chat --continue -m gpt-4o
+    llm chat -m gpt-4o
   else
     llm prompt -m gpt-4o "$argv" && echo "⬇️… and now rendered…⬇️" && llm logs -r | glow
   end