Mostly works, but has bug of not checking primative types for conflicts
authorstephey <stephey>
Tue, 10 Aug 2010 00:39:06 +0000 (00:39 +0000)
committerstephey <stephey>
Tue, 10 Aug 2010 00:39:06 +0000 (00:39 +0000)
commit7ff6bbca927db252799d131114a5a8213a22f58f
tree2df1383ef1b60ff5cdb359c1b4c0586fb19507b2
parentd09512311b728139c0c7b559e30bdcb28390982d
Mostly works, but has bug of not checking primative types for conflicts
Robust/src/IR/Flat/RuntimeConflictResolver.java