Message ID | 20240129202839.2234084-3-gitster@pobox.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 9d2cdd8ae85694a6920aa2a2242f95a226a02898 |
Headers | show |
Series | Comment style fixes | expand |
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; }
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- merge-ort.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)