1
1
mirror of https://github.com/go-gitea/gitea synced 2025-01-22 07:34:26 +00:00
zeripath f1e85622da
Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004)
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>
2021-12-19 05:19:25 +01:00
..
2021-06-07 07:27:09 +02:00
2021-12-06 00:24:57 +08:00
2020-10-02 23:37:53 -04:00
2021-12-10 16:14:24 +08:00
2021-10-18 21:12:26 +01:00
2020-04-05 07:20:50 +01:00
2021-10-13 22:50:23 -04:00