merge-ort: update comments to modern testfile location

In commit 919df3195553 (Collect merge-related tests to t64xx,
2020-08-10), merge related tests were moved from t60xx to t64xx.  Some
comments in merge-ort relating to some tricky code referenced specific
testcases within certain testfiles for additional information, but
referred to their historical testfile names; update the testfile names
to mention their modern location.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/merge-ort.c b/merge-ort.c
index 47b3d1730ece367020eb6c9736c6419f6cd9372f..d87ba6dd42bf7ab05a2481da300da3fdd6ccd8e9 100644 (file)
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -2163,7 +2163,7 @@ static int handle_content_merge(struct merge_options *opt,
                /*
                 * FIXME: If opt->priv->call_depth && !clean, then we really
                 * should not make result->mode match either a->mode or
-                * b->mode; that causes t6036 "check conflicting mode for
+                * b->mode; that causes t6416 "check conflicting mode for
                 * regular file" to fail.  It would be best to use some other
                 * mode, but we'll confuse all kinds of stuff if we use one
                 * where S_ISREG(result->mode) isn't true, and if we use
@@ -2520,7 +2520,7 @@ static void compute_collisions(struct strmap *collisions,
         * happening, and fall back to no-directory-rename detection
         * behavior for those paths.
         *
-        * See testcases 9e and all of section 5 from t6043 for examples.
+        * See testcases 9e and all of section 5 from t6423 for examples.
         */
        for (i = 0; i < pairs->nr; ++i) {
                struct strmap_entry *rename_info;
@@ -2618,7 +2618,7 @@ static char *check_for_directory_rename(struct merge_options *opt,
         * That's why otherinfo and dir_rename_exclusions is here.
         *
         * As it turns out, this also prevents N-way transient rename
-        * confusion; See testcases 9c and 9d of t6043.
+        * confusion; See testcases 9c and 9d of t6423.
         */
        new_dir = rename_info->value; /* old_dir = rename_info->key; */
        otherinfo = strmap_get_entry(dir_rename_exclusions, new_dir);