merge-ll: fix a typo

algonell · gitster · commit a3621abaf9e5 · 2024-09-19T13:46:00.000-07:00
Fix a typo in comments.

Signed-off-by: Andrew Kreimer &lt;algonell@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/merge-ll.c b/merge-ll.c
@@ -332,7 +332,7 @@ static int read_merge_config(const char *var, const char *value,
 		 *    %X - the revision for our version
 		 *    %Y - the revision for their version
 		 *
-		 * If the file is not named indentically in all versions, then each
+		 * If the file is not named identically in all versions, then each
 		 * revision is joined with the corresponding path, separated by a colon.
 		 * The external merge driver should write the results in the
 		 * file named by %A, and signal that it has done with zero exit

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ static int read_merge_config(const char var, const char value,`
`332`	`332`	`* %X - the revision for our version`
`333`	`333`	`* %Y - the revision for their version`
`334`	`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`	`336`	`* revision is joined with the corresponding path, separated by a colon.`
`337`	`337`	`* The external merge driver should write the results in the`
`338`	`338`	`* file named by %A, and signal that it has done with zero exit`