diff options
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/merge.c b/src/merge.c index ec7e5bfd1..c871630c6 100644 --- a/src/merge.c +++ b/src/merge.c @@ -3019,10 +3019,10 @@ static int merge_check_workdir(size_t *conflicts, git_repository *repo, git_inde *conflicts = 0; /* We need to have merged at least 1 file for the possibility to exist to - * have conflicts with the workdir. Passing 0 as the pathspec count paramter + * have conflicts with the workdir. Passing 0 as the pathspec count parameter * will consider all files in the working directory, that is, we may detect * a conflict if there were untracked files in the workdir prior to starting - * the merge. This typically happens when cherry-picking a commmit whose + * the merge. This typically happens when cherry-picking a commit whose * changes have already been applied. */ if (merged_paths->length == 0) |