diff options
| author | 6543 <6543@obermui.de> | 2020-04-03 19:09:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-03 13:09:15 -0400 |
| commit | f7d7cf4e2df58d448f0631459b76fc74aa5fde58 (patch) | |
| tree | c55b16e90656bcf8508d4766bdc37a65f9b7868a /docs/assets | |
| parent | 99a364a9dc803c15efd3ca2ba2fed3179a6aa37a (diff) | |
| download | gitea-f7d7cf4e2df58d448f0631459b76fc74aa5fde58.tar.gz gitea-f7d7cf4e2df58d448f0631459b76fc74aa5fde58.zip | |
Fix rebase conflict detection in git 2.26 (#10930)
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>
Diffstat (limited to 'docs/assets')
0 files changed, 0 insertions, 0 deletions