zeripath 431e482e3f Reset the conflicted files list in testpatch (#18139) ... Although #18004 will seriously reduce the likelihood of finding conflicts in the first place - one bug was introduced whereby the conflicted files status was not being reset properly. This leads to conflicted PRs remaining conflicted when the conflict has been resolved. Signed-off-by: Andrew Thornton <art27@cantab.net>		2021-12-31 20:33:55 +08:00
..
check.go
check_test.go
commit_status.go
lfs.go
main_test.go
merge.go	Abort merge if head has been updated before pressing merge (#18032)	2021-12-20 08:32:54 +08:00
patch.go	Reset the conflicted files list in testpatch (#18139)	2021-12-31 20:33:55 +08:00
patch_unmerged.go
pull.go
pull_test.go
review.go	Simplify parameter types (#18006)	2021-12-20 04:41:31 +00:00
temp_repo.go
update.go	Abort merge if head has been updated before pressing merge (#18032)	2021-12-20 08:32:54 +08:00