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>
Elijah Newren committed
Jun 9, 2018 at 21:16 UTC
2d6bad918d584bd6bfeb134790cc3233c2283884
1 file changed
+1
-1
merge-recursive.c
+1
-1
@@ -539,7 +539,7 @@ static void record_df_conflict_files(struct merge_options *o,
539
struct string_list *entries)
540
{
541
/* If there is a D/F conflict and the file for such a conflict
542
- * currently exist in the working tree, we want to allow it to be
542
+ * currently exists in the working tree, we want to allow it to be
543
* removed to make room for the corresponding directory if needed.
544
* The files underneath the directories of such D/F conflicts will
545
* be processed before the corresponding file involved in the D/F