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
..
agit	Move user related model into models/user (#17781)	3 years ago
asymkey	Add missing `X-Total-Count` and fix some related bugs (#17968)	3 years ago
attachment	Move user related model into models/user (#17781)	3 years ago
auth	Add Option to synchronize Admin & Restricted states from OIDC/OAuth2 along with Setting Scopes (#16766)	3 years ago
comments	Move repository model into models/repo (#17933)	3 years ago
cron	Some repository refactors (#17950)	3 years ago
externalaccount	Refactor HTTP request context (#17979)	3 years ago
forms	Add Reindex buttons to repository settings page (#17494)	3 years ago
gitdiff	Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125)	3 years ago
issue	Move repository model into models/repo (#17933)	3 years ago
lfs	Move repository model into models/repo (#17933)	3 years ago
mailer	Add missing `X-Total-Count` and fix some related bugs (#17968)	3 years ago
migrations	Some repository refactors (#17950)	3 years ago
mirror	Some repository refactors (#17950)	3 years ago
org	Move repository model into models/repo (#17933)	3 years ago
pull	Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004)	3 years ago
release	Move repository model into models/repo (#17933)	3 years ago
repository	Fix rename notification bug (#18008)	3 years ago
task	Some repository refactors (#17950)	3 years ago
user	Move keys to models/asymkey (#17917)	3 years ago
webhook	Add missing `X-Total-Count` and fix some related bugs (#17968)	3 years ago
wiki	Some repository refactors (#17950)	3 years ago