diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-02-06 14:31:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-06 14:31:21 -0800 |
| commit | 184c3b4c735f1c1f0f811fddcf3c2676e7ad613f (patch) | |
| tree | cb31e7c1b5065683639f51189c135a180281562b /merge-ort.c | |
| parent | 92e69dfb66fa5c760e2d1f76c8a21cdb6faacaee (diff) | |
| parent | de65079d7b2801316e398b8806a60607ba45c520 (diff) | |
| download | git-184c3b4c735f1c1f0f811fddcf3c2676e7ad613f.tar.gz | |
Merge branch 'jc/comment-style-fixes'
Rewrite //-comments to /* comments */ in files whose comments
prevalently use the latter.
* jc/comment-style-fixes:
reftable/pq_test: comment style fix
merge-ort.c: comment style fix
builtin/worktree: comment style fixes
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 d72fd04f58..8617babee4 100644 --- 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; } |