mirror of https://github.com/go-gitea/gitea.git
You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
f1e85622da
The current TestPatch conflict code uses a plain git apply which does not properly account for 3-way merging. However, we can improve things using `git read-tree -m` to do a three-way merge then follow the algorithm used in merge-one-file. We can also use `--patience` and/or `--histogram` to generate a nicer diff for applying patches too. Fix #13679 Fix #6417 Signed-off-by: Andrew Thornton <art27@cantab.net> |
3 years ago | |
|---|---|---|
| .. | ||
| agit | 3 years ago | |
| asymkey | 3 years ago | |
| attachment | 3 years ago | |
| auth | 3 years ago | |
| comments | 3 years ago | |
| cron | 3 years ago | |
| externalaccount | 3 years ago | |
| forms | 3 years ago | |
| gitdiff | 3 years ago | |
| issue | 3 years ago | |
| lfs | 3 years ago | |
| mailer | 3 years ago | |
| migrations | 3 years ago | |
| mirror | 3 years ago | |
| org | 3 years ago | |
| pull | 3 years ago | |
| release | 3 years ago | |
| repository | 3 years ago | |
| task | 3 years ago | |
| user | 3 years ago | |
| webhook | 3 years ago | |
| wiki | 3 years ago | |