From: Elijah Newren Date: Sun, 10 Jun 2018 04:16:11 +0000 (-0700) Subject: merge-recursive: fix miscellaneous grammar error in comment X-Git-Tag: v2.19.0-rc0~167^2~5 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2d6bad918d584bd6bfeb134790cc3233c2283884?ds=sidebyside merge-recursive: fix miscellaneous grammar error in comment Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- 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