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 | |
|---|---|---|
| .. | ||
| activitypub | 4 years ago | |
| analyze | 4 years ago | |
| appstate | 3 years ago | |
| auth | 4 years ago | |
| avatar | 3 years ago | |
| base | 4 years ago | |
| cache | 3 years ago | |
| charset | 3 years ago | |
| context | 3 years ago | |
| convert | 3 years ago | |
| csv | 3 years ago | |
| doctor | 3 years ago | |
| emoji | 4 years ago | |
| eventsource | 4 years ago | |
| generate | 4 years ago | |
| git | 3 years ago | |
| gitgraph | 3 years ago | |
| graceful | 3 years ago | |
| hcaptcha | 5 years ago | |
| highlight | 3 years ago | |
| hostmatcher | 3 years ago | |
| httpcache | 3 years ago | |
| httplib | 4 years ago | |
| indexer | 3 years ago | |
| json | 3 years ago | |
| lfs | 3 years ago | |
| log | 3 years ago | |
| markup | 3 years ago | |
| metrics | 4 years ago | |
| migration | 3 years ago | |
| nosql | 3 years ago | |
| notification | 3 years ago | |
| options | 4 years ago | |
| password | 4 years ago | |
| pprof | 4 years ago | |
| private | 3 years ago | |
| process | 3 years ago | |
| proxy | 4 years ago | |
| public | 4 years ago | |
| queue | 3 years ago | |
| recaptcha | 4 years ago | |
| references | 4 years ago | |
| repository | 3 years ago | |
| secret | 4 years ago | |
| session | 3 years ago | |
| setting | 3 years ago | |
| ssh | 3 years ago | |
| storage | 4 years ago | |
| structs | 3 years ago | |
| svg | 4 years ago | |
| sync | 5 years ago | |
| templates | 3 years ago | |
| test | 3 years ago | |
| timeutil | 3 years ago | |
| translation | 4 years ago | |
| typesniffer | 3 years ago | |
| updatechecker | 3 years ago | |
| upload | 3 years ago | |
| uri | 4 years ago | |
| user | 5 years ago | |
| util | 3 years ago | |
| validation | 4 years ago | |
| web | 3 years ago | |