forked from gitea/gitea
		
	 97eb37e823
			
		
	
	
		97eb37e823
		
			
		
	
	
	
	
		
			
			* 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>