merge-ll: fix a typo
Fix a typo in comments. Signed-off-by: Andrew Kreimer <algonell@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Andrew Kreimer committed
Sep 19, 2024 at 18:34 UTC
a3621abaf9e5958bb6d9ad1d19af8f430c361b76
1 file changed
+1
-1
merge-ll.c
+1
-1
@@ -332,7 +332,7 @@ static int read_merge_config(const char *var, const char *value,
332
* %X - the revision for our version
333
* %Y - the revision for their version
334
*
335
- * If the file is not named indentically in all versions, then each
335
+ * If the file is not named identically in all versions, then each
336
* revision is joined with the corresponding path, separated by a colon.
337
* The external merge driver should write the results in the
338
* file named by %A, and signal that it has done with zero exit