You cannot 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 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>		3 years ago
..
check.go	Move repository model into models/repo (#17933)	3 years ago
check_test.go	Decouple unit test, remove intermediate `unittestbridge` package (#17662)	3 years ago
commit_status.go	Add missing `X-Total-Count` and fix some related bugs (#17968)	3 years ago
lfs.go	Move repository model into models/repo (#17933)	3 years ago
main_test.go	Decouple unit test code from business code (#17623)	3 years ago
merge.go	Restore propagation of ErrDependenciesLeft (#18325)	3 years ago
patch.go	Detect conflicts with 3way merge (#18536) (#18537)	3 years ago
patch_unmerged.go	Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004)	3 years ago
pull.go	Restore propagation of ErrDependenciesLeft (#18325)	3 years ago
pull_test.go	…
review.go	Simplify parameter types (#18006)	3 years ago
temp_repo.go	Move repository model into models/repo (#17933)	3 years ago
update.go	Abort merge if head has been updated before pressing merge (#18032)	3 years ago