Merge branch 'jx/dirstat-parseopt-help'

[thirdparty/git.git] / merge-ort.c

diff --git a/merge-ort.c b/merge-ort.c
index d72fd04f581fbb99732d1e5c7b48a1d4ae83efc0..8617babee41cb59aa5b3dac97a55a53f92e7bc20 100644 (file)
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -2642,7 +2642,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;
        }