From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Jan 2024 20:28:38 +0000 (-0800)
Subject: merge-ort.c: comment style fix
X-Git-Tag: v2.44.0-rc0~17^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d2cdd8ae85694a6920aa2a2242f95a226a02898;p=thirdparty%2Fgit.git

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 6491070d96..6fd9d06420 100644
--- 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;
 	}