mirror of
				https://github.com/jesseduffield/lazygit.git
				synced 2025-10-30 23:57:43 +02:00 
			
		
		
		
	Discard value after END marker
This commit is contained in:
		
				
					committed by
					
						 Jesse Duffield
						Jesse Duffield
					
				
			
			
				
	
			
			
			
						parent
						
							fd38ad8096
						
					
				
				
					commit
					05a23f0e1e
				
			| @@ -35,6 +35,8 @@ func findConflicts(content string) []*mergeConflict { | ||||
| 		case END: | ||||
| 			newConflict.end = i | ||||
| 			conflicts = append(conflicts, newConflict) | ||||
| 			// reset value to avoid any possible silent mutations in further iterations | ||||
| 			newConflict = nil | ||||
| 		default: | ||||
| 			// line isn't a merge conflict marker so we just continue | ||||
| 		} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user