mirror of
https://github.com/go-gitea/gitea.git
synced 2024-12-04 14:46:57 -05:00
f7d7cf4e2d
Git changed the technique used in rebase from simple apply-patches to use merge. This breaks our conflict detection code. created by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lauris BH <lauris@nix.lv> |
||
---|---|---|
.. | ||
comments | ||
externalaccount | ||
gitdiff | ||
issue | ||
mailer | ||
mirror | ||
pull | ||
release | ||
repository | ||
wiki |