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
..
check_test.go	Decouple unit test, remove intermediate unittestbridge package (#17662)	2021-11-16 16:53:21 +08:00
check.go	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00
commit_status.go	Add missing X-Total-Count and fix some related bugs (#17968)	2021-12-15 13:39:34 +08:00
lfs.go	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00
main_test.go	Decouple unit test code from business code (#17623)	2021-11-12 22:36:47 +08:00
merge.go	Move keys to models/asymkey (#17917)	2021-12-10 16:14:24 +08:00
patch_unmerged.go	Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004)	2021-12-19 05:19:25 +01:00
patch.go	Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004)	2021-12-19 05:19:25 +01:00
pull_test.go	Append to existing trailers in generated squash commit message (#15980)	2021-06-25 13:01:43 -04:00
pull.go	Prevent hang in git cat-file if repository is not a valid repository and other fixes (#17991)	2021-12-16 19:01:14 +00:00
review.go	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00
temp_repo.go	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00
update.go	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00