forked from gitea/gitea

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>
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>