zeripath 92e81e97e8 Detect conflicts with 3way merge (#18536) ... * Detect conflicts with 3way merge 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> * and three-way failed Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>		2022-02-02 12:46:10 +08:00
..
agit
asymkey
attachment
auth	Use ImagedProvider for gplus oauth2 provider (#18504)	2022-02-01 01:02:56 +01:00
comments
cron
externalaccount
forms	Add packagist webhook (#18224)	2022-01-23 21:46:30 +08:00
gitdiff	Fix partial cloning a repo (#18373)	2022-01-23 22:19:32 +01:00
issue
lfs
mailer	Pause queues (#15928)	2022-01-22 21:22:14 +00:00
migrations	add test coverage for original author conversion during migrations (#18506)	2022-02-01 13:20:28 -05:00
mirror	Pause queues (#15928)	2022-01-22 21:22:14 +00:00
org
pull	Detect conflicts with 3way merge (#18536)	2022-02-02 12:46:10 +08:00
release
repository	Pause queues (#15928)	2022-01-22 21:22:14 +00:00
task	Pause queues (#15928)	2022-01-22 21:22:14 +00:00
user
webhook	Add packagist webhook (#18224)	2022-01-23 21:46:30 +08:00
wiki