mirror of
https://github.com/git/git.git
synced 2024-10-28 04:49:43 +01:00
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>
This commit is contained in:
parent
6f333ff2fb
commit
2d6bad918d
1 changed files with 1 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue