mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-15 15:19:36 +01:00
8f06a99c2c
See
https://codeberg.org/forgejo/forgejo/pulls/3130#issuecomment-1763440
for the conflict resolution.
(cherry picked from commit
|
||
---|---|---|
.. | ||
check.go | ||
check_test.go | ||
comment.go | ||
commit_status.go | ||
commit_status_test.go | ||
edits.go | ||
lfs.go | ||
main_test.go | ||
merge.go | ||
merge_ff_only.go | ||
merge_merge.go | ||
merge_prepare.go | ||
merge_rebase.go | ||
merge_squash.go | ||
merge_test.go | ||
patch.go | ||
patch_unmerged.go | ||
pull.go | ||
pull_test.go | ||
review.go | ||
review_test.go | ||
temp_repo.go | ||
update.go | ||
update_rebase.go |