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
..
check.go	Pause queues (#15928)	2022-01-22 21:22:14 +00:00
check_test.go	Pause queues (#15928)	2022-01-22 21:22:14 +00:00
commit_status.go	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00
lfs.go	…
main_test.go	…
merge.go	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00
patch.go	Detect conflicts with 3way merge (#18536)	2022-02-02 12:46:10 +08:00
patch_unmerged.go	…
pull.go	Add config options to hide issue events (#17414)	2022-01-21 18:59:26 +01:00
pull_test.go	…
review.go	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00
temp_repo.go	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00
update.go	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00