Merging complete. Everything looks good *crosses fingers*

1 files changed, 17 insertions, 17 deletions

diff --git a/Test/test0/Triggers0.bpl b/Test/test0/Triggers0.bpl
index 0113b992..34e89727 100644
--- a/Test/test0/Triggers0.bpl
+++ b/Test/test0/Triggers0.bpl
@@ -1,17 +1,17 @@
-// RUN: %boogie -noVerify "%s" > "%t"

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

-// Trigger errors

-

-function f(int, int) returns (int);

-function P(int, int) returns (bool);

-

-// -------------- tests specific to pattern exclusions

-

-axiom (forall x: int ::

-       {:nopats f(x,10) }

-       { :   nopats   f(x,10) }

-       f(x,10) == 3);

-

-axiom (forall x: int ::

-       {:nopats f(x,10), f(x,x) }  // error: a pattern exclusion can only mention one expression

-       f(x,10) == 3);

+// RUN: %boogie -noVerify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+// Trigger errors
+
+function f(int, int) returns (int);
+function P(int, int) returns (bool);
+
+// -------------- tests specific to pattern exclusions
+
+axiom (forall x: int ::
+       {:nopats f(x,10) }
+       { :   nopats   f(x,10) }
+       f(x,10) == 3);
+
+axiom (forall x: int ::
+       {:nopats f(x,10), f(x,x) }  // error: a pattern exclusion can only mention one expression
+       f(x,10) == 3);