mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/comment-style-fixes'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2024-02-06 14:31:21 -08:00
parent 92e69dfb66 de65079d7b
commit 184c3b4c73
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
merge-ort.c
View File

@ -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;
}