mirror of
				https://github.com/rust-lang/rust.git
				synced 2025-10-31 04:57:19 +00:00 
			
		
		
		
	
		
			
				
	
	
		
			8 lines
		
	
	
		
			105 B
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			8 lines
		
	
	
		
			105 B
		
	
	
	
		
			Rust
		
	
	
	
	
	
| struct S {
 | |
| <<<<<<< HEAD //~ ERROR encountered diff marker
 | |
|     x: u8,
 | |
| =======
 | |
|     x: i8,
 | |
| >>>>>>> branch
 | |
| }
 | 
