diff options
| author | Elijah Newren <newren@gmail.com> | 2018-06-10 07:16:11 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-12 20:22:50 +0300 |
| commit | 2d6bad918d584bd6bfeb134790cc3233c2283884 (patch) | |
| tree | dc68a609fa7b17ec049a04a2adcc061c959d67c1 /merge-recursive.c | |
| parent | 6f333ff2fb28add6d54e9526b8dfdf47bc2b7a9a (diff) | |
merge-recursive: fix miscellaneous grammar error in comment
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index ac27abbd4c..921f8e2d2d 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -539,7 +539,7 @@ static void record_df_conflict_files(struct merge_options *o, struct string_list *entries) { /* If there is a D/F conflict and the file for such a conflict - * currently exist in the working tree, we want to allow it to be + * currently exists in the working tree, we want to allow it to be * removed to make room for the corresponding directory if needed. * The files underneath the directories of such D/F conflicts will * be processed before the corresponding file involved in the D/F |