summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-04 16:26:47 +0900
committerJunio C Hamano <gitster@pobox.com>2017-05-04 16:26:47 +0900
commit7c7478f45a67121aeda2e1d276feb34c5786e611 (patch)
tree1a97d484ba1ff9d203209e64974a1a55de409e2c /diff.c
parentc8ddd2aa116710e3442bc54cd750824a88a900d4 (diff)
parent5621760f59c0655e41045c3141deef9791858916 (diff)
downloadgit-7c7478f45a67121aeda2e1d276feb34c5786e611.tar.gz
Merge branch 'rg/a-the-typo'
Typofix. * rg/a-the-typo: fix minor typos
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index 11eef1c85d..74283d9001 100644
--- a/diff.c
+++ b/diff.c
@@ -911,7 +911,7 @@ static int fn_out_diff_words_write_helper(FILE *fp,
/*
* '--color-words' algorithm can be described as:
*
- * 1. collect a the minus/plus lines of a diff hunk, divided into
+ * 1. collect the minus/plus lines of a diff hunk, divided into
* minus-lines and plus-lines;
*
* 2. break both minus-lines and plus-lines into words and