shithub: mc

Download patch

ref: f3265a99202d98f6f7e5969e34faae934ce754b9
parent: f43021ba4fcf39c9ebd718bb3e594f063680e584
author: S. Gilles <sgilles@math.umd.edu>
date: Tue Mar 20 05:55:04 EDT 2018

Fix corrupted merge of 'autoexpr'

--- a/6/isel.c
+++ b/6/isel.c
@@ -939,7 +939,6 @@
 		/* These operators should never show up in the reduced trees,
 		 * since they should have been replaced with more primitive
 		 * expressions by now */
-<<<<<<< HEAD
 	case Obad: case Oauto: case Opreinc: case Opostinc: case Opredec:
 	case Otern: case Opostdec: case Olor: case Oland: case Oaddeq:
 	case Osubeq: case Omuleq: case Odiveq: case Omodeq: case Oboreq: