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>

diff --git a/merge-ll.c b/merge-ll.c
index 180c19df6737fe13404095ccbc5d65a880ff3a68..b32bef6e574bf37b5d66b323c6d0ce0f942d6245 100644 (file)
--- 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