Merging complete. Everything looks good *crosses fingers*

1 files changed, 18 insertions, 18 deletions

diff --git a/Test/AbsHoudini/fail1.bpl b/Test/AbsHoudini/fail1.bpl
index 02bcb8d3..4605c7e9 100644
--- a/Test/AbsHoudini/fail1.bpl
+++ b/Test/AbsHoudini/fail1.bpl
@@ -1,18 +1,18 @@
-// RUN: %boogie -noinfer -contractInfer -printAssignment -abstractHoudini:IA[ConstantProp] "%s" > "%t"

-// RUN: %diff "%s.expect" "%t"

-function {:existential true} b1(x: bool) : bool;

-

-var myVar: int;

-

-procedure foo (i:int)

-modifies myVar;

-ensures b1(myVar>0);

-{

-  if (i>0) {

-    myVar := 5;

-  } else {

-    myVar := 0;

-  }

-  assert false;

-}

-

+// RUN: %boogie -noinfer -contractInfer -printAssignment -abstractHoudini:IA[ConstantProp] "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+function {:existential true} b1(x: bool) : bool;
+
+var myVar: int;
+
+procedure foo (i:int)
+modifies myVar;
+ensures b1(myVar>0);
+{
+  if (i>0) {
+    myVar := 5;
+  } else {
+    myVar := 0;
+  }
+  assert false;
+}
+