diff options
| author | Andrew Kreimer <algonell@gmail.com> | 2024-09-19 18:34:28 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-09-19 13:46:00 -0700 |
| commit | a3621abaf9e5958bb6d9ad1d19af8f430c361b76 (patch) | |
| tree | e50a883941c1297c09eecf2495be5fb820c933d8 | |
| parent | http: fix a typo (diff) | |
| download | git-a3621abaf9e5958bb6d9ad1d19af8f430c361b76.tar.gz git-a3621abaf9e5958bb6d9ad1d19af8f430c361b76.zip | |
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>
| -rw-r--r-- | merge-ll.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |