zeripath 97eb37e823 Fix rebase conflict detection in git 2.26 (#10929) ... * Fix rebase conflict detection in git 2.26 Git changed the technique used in rebase from simple apply-patches to use merge. This breaks our conflict detection code. Signed-off-by: Andrew Thornton <art27@cantab.net> * As per @techknowlogick reduce copying Signed-off-by: Andrew Thornton <art27@cantab.net>		2020-04-03 19:00:41 +03:00
..
comments
externalaccount
gitdiff
issue	Add Organization Wide Labels (#10814)	2020-04-01 01:14:46 -03:00
mailer
mirror
pull	Fix rebase conflict detection in git 2.26 (#10929)	2020-04-03 19:00:41 +03:00
release
repository
wiki