zeripath 84f5a0bc62 Always set the merge base used to merge the commit (#15352) ... The issue is that the TestPatch will reset the PR MergeBase - and it is possible for TestPatch to update the MergeBase whilst a merge is ongoing. The ensuing merge will then complete but it doesn't re-set the MergeBase it used to merge the PR. Fixes the intermittent error in git test. Signed-off-by: Andrew Thornton art27@cantab.net		2021-04-10 09:27:29 +01:00
..
check.go	…
check_test.go	…
commit_status.go	…
lfs.go	Add LFS Migration and Mirror (#14726)	2021-04-08 18:25:57 -04:00
main_test.go	…
merge.go	Always set the merge base used to merge the commit (#15352)	2021-04-10 09:27:29 +01:00
patch.go	…
pull.go	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
pull_test.go	…
review.go	…
temp_repo.go	…
update.go	…