Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> --- merge-ort.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge-ort.c b/merge-ort.c index 77ba7f3020..cb83449d7f 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -2641,7 +2641,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; } -- 2.43.0-440-gb50a608ba2
