mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-10-15 19:42:04 +00:00
Merge branch 'forgejo' into port-32327
This commit is contained in:
commit
59ee6b52ca
48 changed files with 1069 additions and 263 deletions
|
@ -414,7 +414,7 @@ func IsErrSHAOrCommitIDNotProvided(err error) bool {
|
|||
}
|
||||
|
||||
func (err ErrSHAOrCommitIDNotProvided) Error() string {
|
||||
return "a SHA or commit ID must be proved when updating a file"
|
||||
return "a SHA or commit ID must be provided when updating a file"
|
||||
}
|
||||
|
||||
// ErrInvalidMergeStyle represents an error if merging with disabled merge strategy
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue