Merge branch 'en/random-cleanups'

Miscellaneous code clean-ups.

* en/random-cleanups:
  merge-ort: remove extraneous word in comment
  merge-ort: fix accidental strset<->strintmap
  t7615: be more explicit about diff algorithm used
  t6423: fix a comment that accidentally reversed two commits
  stash: remove merge-recursive.h include

diff --cc merge-ort.c
index e328511e19097b463da41132b4d0ea943f94cd3a,9efc2285a94972fe6ca146713c4e1e9a1cce94bc..2b7d86aa4ec17e8d3ed8d1f84da56a280c107e36
--- 1/merge-ort.c
--- 2/merge-ort.c
+++ b/merge-ort.c
@@@ -3427,12 -3421,11 +3427,12 @@@ static int collect_renames(struct merge
                if (new_path)
                        apply_directory_rename_modifications(opt, p, new_path);
  
 +skip_directory_renames:
                /*
                 * p->score comes back from diffcore_rename_extended() with
-                * the similarity of the renamed file.  The similarity is
-                * was used to determine that the two files were related
-                * and are a rename, which we have already used, but beyond
+                * the similarity of the renamed file.  The similarity was
+                * used to determine that the two files were related and
+                * are a rename, which we have already used, but beyond
                 * that we have no use for the similarity.  So p->score is
                 * now irrelevant.  However, process_renames() will need to
                 * know which side of the merge this rename was associated

diff --cc t/t6423-merge-rename-directories.sh
Simple merge