Snapshots

egraphs-good · May 24, 2024 · 73bd671 · 73bd671
1 parent c215019
commit 73bd671
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 44 deletions.
diff --git a/tests/snapshots/files__range_check-optimize.snap b/tests/snapshots/files__range_check-optimize.snap
@@ -22,7 +22,6 @@ expression: visualization.result
   v15_: int = id v14_;
   br v5_ .v16_ .v17_;
 .v16_:
-<<<<<<< HEAD
   v15_: int = id v14_;
 .v17_:
   v2_: int = id v15_;
@@ -34,26 +33,4 @@ expression: visualization.result
   jmp .v12_;
 .v18_:
   print v2_;
-=======
-  v17_: int = const 1;
-  v18_: int = add v17_ v6_;
-  v19_: int = id v18_;
-  br v9_ .v20_ .v21_;
-.v20_:
-  v19_: int = id v18_;
-.v21_:
-  v6_: int = id v19_;
-  br v9_ .v7_ .v22_;
-.v22_:
-  v3_: int = id v6_;
-  print v3_;
-  ret;
-.v13_:
-  v23_: int = const 2;
-  print v23_;
-  v15_: int = id v6_;
-  jmp .v16_;
-.v5_:
-  print v3_;
->>>>>>> main
 }
diff --git a/tests/snapshots/files__range_splitting-optimize.snap b/tests/snapshots/files__range_splitting-optimize.snap
@@ -31,26 +31,5 @@ expression: visualization.result
   v12_: int = id v2_;
   jmp .v13_;
 .v17_:
-<<<<<<< HEAD
   print v2_;
-=======
-  v18_: int = id v9_;
-  br v11_ .v19_ .v20_;
-.v19_:
-  v18_: int = id v9_;
-.v20_:
-  v6_: int = id v18_;
-  br v11_ .v7_ .v21_;
-.v21_:
-  v3_: int = id v6_;
-  print v3_;
-  ret;
-.v14_:
-  v22_: int = const 2;
-  print v22_;
-  v16_: int = id v6_;
-  jmp .v17_;
-.v5_:
-  print v3_;
->>>>>>> main
 }