Use DIFF_DETECT_RENAME for detect_rename assignments

diff --git a/diff.c b/diff.c
index 11eef1c85d6d766320bfa24b10483fbc0869efe1..4359e3be688127095dd478949830106f8be5d2ba 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -218,7 +218,7 @@ static int parse_ws_error_highlight(const char *arg)
  */
 void init_diff_ui_defaults(void)
 {
-       diff_detect_rename_default = 1;
+       diff_detect_rename_default = DIFF_DETECT_RENAME;
 }
 
 int git_diff_heuristic_config(const char *var, const char *value, void *cb)
@@ -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