merge-ort.c: comment style fix

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/merge-ort.c b/merge-ort.c
index 6491070d965835f9202b68fbdae72cb6cd6c987f..6fd9d064206ae0d56ed74665363919b29f11c545 100644 (file)
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -2644,7 +2644,7 @@ static void apply_directory_rename_modifications(struct merge_options *opt,
                        oidcpy(&ci->stages[i].oid, null_oid());
                }
 
-               // Now we want to focus on new_ci, so reassign ci to it
+               /* Now we want to focus on new_ci, so reassign ci to it. */
                ci = new_ci;
        }