[PATCH 08/20] merge-ll: fix a typo

From

Andrew Kreimer via GitGitGadget <gitgitgadget@gmail.com>

Date

Sep 19, 2024, 18:34 UTC

Message-ID

<7c950c793213681cbaa0e9cf25294291edc2fdce.1726770881.git.gitgitgadget@gmail.com>

In-Reply-To

<pull.1794.git.1726770880.gitgitgadget@gmail.com>

From: Andrew Kreimer <algonell@gmail.com>

Fix a typo in comments.

Signed-off-by: Andrew Kreimer <algonell@gmail.com>
---
 merge-ll.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merge-ll.c b/merge-ll.c
index badb6dea57c..8e63071922b 100644
--- a/merge-ll.c
+++ b/merge-ll.c
@@ -334,7 +334,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

-- 
gitgitgadget