zeripath 0dfe5fa2d6 Detect conflicts with 3way merge (#18536) (#18537) ... Backport #18536 Unforunately git apply --3way reports conflicts differently than standard patches resulting in conflicts being missed. Adjust the conflict detection code to account for this different error reporting. Fix #18514 Signed-off-by: Andrew Thornton <art27@cantab.net>		2022-02-02 14:35:25 +00:00
..
agit	Fix various typos (#18219)	2022-01-10 17:32:37 +08:00
asymkey
attachment
auth	Use ImagedProvider for gplus oauth2 provider (#18504) (#18505)	2022-02-01 10:45:58 +08:00
comments
cron
externalaccount
forms	Support webauthn (#17957)	2022-01-14 16:03:31 +01:00
gitdiff	Fix various typos (#18219)	2022-01-10 17:32:37 +08:00
issue	Restore propagation of ErrDependenciesLeft (#18325)	2022-01-19 00:26:42 +01:00
lfs	Support webauthn (#17957)	2022-01-14 16:03:31 +01:00
mailer
migrations	GitLab reviews may not have the updated_at field set (#18450) (#18461)	2022-01-30 14:56:39 +01:00
mirror
org
pull	Detect conflicts with 3way merge (#18536) (#18537)	2022-02-02 14:35:25 +00:00
release
repository	Stop trimming preceding and suffixing spaces from editor filenames (#18334)	2022-01-19 21:03:15 +00:00
task
user
webhook
wiki	Fix various typos (#18219)	2022-01-10 17:32:37 +08:00