mirror of
				https://github.com/rust-lang/rust.git
				synced 2025-10-31 13:04:42 +00:00 
			
		
		
		
	
		
			
				
	
	
		
			12 lines
		
	
	
		
			150 B
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			12 lines
		
	
	
		
			150 B
		
	
	
	
		
			Rust
		
	
	
	
	
	
| enum E {
 | |
|     Foo {
 | |
| <<<<<<< HEAD //~ ERROR encountered diff marker
 | |
|         x: u8,
 | |
| |||||||
 | |
|         z: (),
 | |
| =======
 | |
|         y: i8,
 | |
| >>>>>>> branch
 | |
|     }
 | |
| }
 | 
