Fix rebase conflict detection in git 2.26#10929

lafriks merged 3 commits into

go-gitea:mastergo-gitea/gitea:masterfrom

zeripath:fix-rebase-conflicts-code-for-git-2.26zeripath/gitea:fix-rebase-conflicts-code-for-git-2.26Copy head branch name to clipboard