Add syntax highlighting to post

Author: wkirby

posts/2025-07-22-diff3.md

@@ -18,7 +18,7 @@ Two developers both made changes to this line, resulting in a merge conflict.
 
 What's the correct resolution to the conflict?
 
-```
+```diff
 <<<<<<<
 HELLO WORLD
 =======
@@ -72,13 +72,14 @@ D) We don't have enough information to say!
 
 It depends on the context: What was the original version before both changes? There are two possible scenarios:
 
+
 <img src="/img/posts/diff3/diff3.png" alt="Two possible scenarios">
 
 ## The solution: diff3
 
 The `diff3` option adds an extra section to your merge conflicts. Let's take a look at our conflict again using that option:
 
-```
+```diff
 <<<<<<<
 HELLO WORLD
 |||||||
@@ -96,7 +97,7 @@ Now we can tell what the answer is. ([View the solution][solution])
 
 To use this option, run this command: (Or manually modify your `gitconfig` file)
 
-```
+```bash
 git config --global merge.conflictstyle diff3
 ```
 

src/styles/_typography.scss

@@ -220,3 +220,7 @@
     font-size: var(--font_size_lg);
   }
 }
+
+.hljs {
+  border-radius: 2px !important;
+}