diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-01-29 12:28:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-29 14:08:52 -0800 |
| commit | 9d2cdd8ae85694a6920aa2a2242f95a226a02898 (patch) | |
| tree | e5ec2c451d6db3833c480b166456d22e56e8ca2c /merge-ort.c | |
| parent | 777f7838415f6e83c350a39b8119e38794a04739 (diff) | |
| download | git-9d2cdd8ae85694a6920aa2a2242f95a226a02898.tar.gz | |
merge-ort.c: comment style fix
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |