diff options
| author | Andrei Rybak <rybak.a.v@gmail.com> | 2021-06-11 13:18:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-06-14 10:16:06 +0900 |
| commit | abcb66c614c574cfa1afccb230bf22cbde4d5557 (patch) | |
| tree | e8f002ec36c9cc7788dc2e6db705c6ef624728fc /merge-recursive.c | |
| parent | ebf3c04b262aa27fbb97f8a0156c2347fecafafb (diff) | |
| download | git-abcb66c614c574cfa1afccb230bf22cbde4d5557.tar.gz | |
*: fix typos which duplicate a word
Fix typos in documentation, code comments, and RelNotes which repeat
various words. In trivial cases, just delete the duplicated word and
rewrap text, if needed. Reword the affected sentence in
Documentation/RelNotes/1.8.4.txt for it to make sense.
Signed-off-by: Andrei Rybak <rybak.a.v@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 d146bb116f..4327e0cfa3 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -2152,7 +2152,7 @@ static char *handle_path_level_conflicts(struct merge_options *opt, * implicit renaming of files that should be left in place. (See * testcase 6b in t6043 for details.) * 2. Prune directory renames if there are still files left in the - * the original directory. These represent a partial directory rename, + * original directory. These represent a partial directory rename, * i.e. a rename where only some of the files within the directory * were renamed elsewhere. (Technically, this could be done earlier * in get_directory_renames(), except that would prevent us from |