From: Elijah Newren Date: Sat, 19 May 2018 02:06:56 GMT Subject: [PATCH 1/5] merge-recursive: fix miscellaneous grammar error in comment Message-ID: <20180519020700.2241-2-newren@gmail.com> In-Reply-To: <20180519020700.2241-1-newren@gmail.com> Signed-off-by: Elijah Newren --- merge-recursive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge-recursive.c b/merge-recursive.c index 35df695fa4..c430fd72bc 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -531,7 +531,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 -- 2.17.0.847.g20b8963732