commit 4763b4d4b196601437e37e5ccc71c0190334e55d
from: Omar Polo <op@omarpolo.com>
via: Thomas Adam <thomas@xteddy.org>
date: Tue Sep 10 14:11:00 2024 UTC

sync files from diff.git edc37d001aae9784c6d575f08850d49139adf02f

commit - 38b2f36751671284d30e77bfde33813354caaf48
commit + 4763b4d4b196601437e37e5ccc71c0190334e55d
blob - 37b7f2b63c9f5a8e3a7ccee3cd4d60d698ef7c22
blob + a1582369521412e3cd2a2f9c8047c7e9004a24b6
--- lib/diff_myers.c
+++ lib/diff_myers.c
@@ -1370,7 +1370,7 @@ diff_algo_myers(const struct diff_algo_config *algo_co
 			 * is horizontal, meaning first remove one atom from the
 			 * left before sliding down the snake.
 			 * If right_section_len > left_section_len, the lead-in
-			 * is vetical, so add one atom from the right before
+			 * is vertical, so add one atom from the right before
 			 * sliding down the snake. */
 			if (left_section_len == right_section_len + 1) {
 				if (!diff_state_add_chunk(state, true,
blob - a06df2c36c9d8cb203803661ff563e969a584e88
blob + 6ef9ad7b307300550afe1dee8a908ded0270c67a
--- lib/diff_patience.c
+++ lib/diff_patience.c
@@ -105,7 +105,7 @@ diff_atoms_mark_unique_in_both(struct diff_data *left,
 			       unsigned int *unique_in_both_count)
 {
 	/* Derive the final unique_in_both count without needing an explicit
-	 * iteration. So this is just some optimiziation to save one iteration
+	 * iteration. So this is just some optimization to save one iteration
 	 * in the end. */
 	unsigned int unique_in_both;
 	int r;