You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		3 years ago
..
check.go	Move repository model into models/repo (#17933)	3 years ago
check_test.go	Decouple unit test, remove intermediate `unittestbridge` package (#17662)	3 years ago
commit_status.go	Add missing `X-Total-Count` and fix some related bugs (#17968)	3 years ago
lfs.go	Move repository model into models/repo (#17933)	3 years ago
main_test.go	Decouple unit test code from business code (#17623)	3 years ago
merge.go	Move keys to models/asymkey (#17917)	3 years ago
patch.go	Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004)	3 years ago
patch_unmerged.go	Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004)	3 years ago
pull.go	Prevent hang in git cat-file if repository is not a valid repository and other fixes (#17991)	3 years ago
pull_test.go	Append to existing trailers in generated squash commit message (#15980)	4 years ago
review.go	Move repository model into models/repo (#17933)	3 years ago
temp_repo.go	Move repository model into models/repo (#17933)	3 years ago
update.go	Move repository model into models/repo (#17933)	3 years ago