mirror of
https://github.com/go-gitea/gitea
synced 2024-12-25 22:14:36 +01:00
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> |
||
|---|---|---|
| .. | ||
| activitypub | ||
| analyze | ||
| appstate | ||
| auth | ||
| avatar | ||
| base | ||
| cache | ||
| charset | ||
| context | ||
| convert | ||
| csv | ||
| doctor | ||
| emoji | ||
| eventsource | ||
| generate | ||
| git | ||
| gitgraph | ||
| graceful | ||
| hcaptcha | ||
| highlight | ||
| hostmatcher | ||
| httpcache | ||
| httplib | ||
| indexer | ||
| json | ||
| lfs | ||
| log | ||
| markup | ||
| metrics | ||
| migration | ||
| nosql | ||
| notification | ||
| options | ||
| password | ||
| pprof | ||
| private | ||
| process | ||
| proxy | ||
| public | ||
| queue | ||
| recaptcha | ||
| references | ||
| repository | ||
| secret | ||
| session | ||
| setting | ||
| ssh | ||
| storage | ||
| structs | ||
| svg | ||
| sync | ||
| templates | ||
| test | ||
| timeutil | ||
| translation | ||
| typesniffer | ||
| updatechecker | ||
| upload | ||
| uri | ||
| user | ||
| util | ||
| validation | ||
| web | ||