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
..
check.go
check_test.go
commit_status.go
lfs.go
main_test.go
merge.go	Restore propagation of ErrDependenciesLeft (#18325)	2022-01-19 00:26:42 +01:00
patch.go	Detect conflicts with 3way merge (#18536) (#18537)	2022-02-02 14:35:25 +00:00
patch_unmerged.go
pull.go	Restore propagation of ErrDependenciesLeft (#18325)	2022-01-19 00:26:42 +01:00
pull_test.go
review.go
temp_repo.go
update.go