blah

tac/simple.c.orig

@@ -1,14 +0,0 @@
-int blah() {
-  int blah2() {
-    return 2;
-  }
-  return blah2();
-}
-
-int main() {
-<<<<<<< HEAD
-  return times(4+5);
-=======
-  return blah();
->>>>>>> 87f65c41c69413a8cc3fe3da8b302ddb20630544
-}

tac/simple_BACKUP_41992.c

@@ -1,14 +0,0 @@
-int blah() {
-  int blah2() {
-    return 2;
-  }
-  return blah2();
-}
-
-int main() {
-<<<<<<< HEAD
-  return times(4+5);
-=======
-  return blah();
->>>>>>> 87f65c41c69413a8cc3fe3da8b302ddb20630544
-}

tac/simple_BASE_41992.c

@@ -1,6 +0,0 @@
-int times(int x, int y) {
-  return x * y;
-}
-int main() {
-  return times(4+5, times(2, 4));
-}

tac/simple_LOCAL_41992.c

@@ -1,6 +0,0 @@
-int times(int x, int y) {
-  return x * y;
-}
-int main() {
-  return times(4+5);
-}

tac/simple_REMOTE_41992.c

@@ -1,10 +0,0 @@
-int blah() {
-  int blah2() {
-    return 2;
-  }
-  return blah2();
-}
-
-int main() {
-  return blah();
-}