Merge branch 'bc/object-id'

diff --git a/diff.c b/diff.c
index 3bd23ae4cda43125fc7f0da8fe5375aab0b94d35..f3546536b4b09097b85ec2ae8072362cdac32e06 100644 (file)
--- 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