mirror of
https://github.com/go-gitea/gitea.git
synced 2024-12-04 14:46:57 -05:00
97eb37e823
* Fix rebase conflict detection in git 2.26 Git changed the technique used in rebase from simple apply-patches to use merge. This breaks our conflict detection code. Signed-off-by: Andrew Thornton <art27@cantab.net> * As per @techknowlogick reduce copying Signed-off-by: Andrew Thornton <art27@cantab.net> |
||
---|---|---|
.. | ||
check_test.go | ||
check.go | ||
commit_status.go | ||
lfs.go | ||
main_test.go | ||
merge.go | ||
patch.go | ||
pull_test.go | ||
pull.go | ||
review.go | ||
temp_repo.go | ||
update.go |