From: Andrew Kreimer Date: Thu, 19 Sep 2024 18:34:28 +0000 (+0000) Subject: merge-ll: fix a typo X-Git-Tag: v2.47.0-rc0~10^2~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a3621abaf9e5958bb6d9ad1d19af8f430c361b76;p=thirdparty%2Fgit.git merge-ll: fix a typo Fix a typo in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- diff --git a/merge-ll.c b/merge-ll.c index 180c19df67..b32bef6e57 100644 --- 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