7ef0d62730
Merge commit '1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5' as 'third_party/git'
43 lines
795 B
Text
43 lines
795 B
Text
commit 4a23ae5c98d59a58c6da036156959f2dc9f472ad
|
|
Author: Thomas Rast <trast@student.ethz.ch>
|
|
Date: Thu Feb 28 10:47:40 2013 +0100
|
|
|
|
change at very beginning
|
|
|
|
diff --git a/a.c b/a.c
|
|
--- a/a.c
|
|
+++ b/a.c
|
|
@@ -1,3 +1,4 @@
|
|
+#include <unistd.h>
|
|
#include <stdio.h>
|
|
|
|
long f(long x)
|
|
|
|
commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
|
|
Author: Thomas Rast <trast@student.ethz.ch>
|
|
Date: Thu Feb 28 10:45:16 2013 +0100
|
|
|
|
touch both functions
|
|
|
|
diff --git a/a.c b/a.c
|
|
--- a/a.c
|
|
+++ b/a.c
|
|
@@ -1,3 +1,3 @@
|
|
#include <stdio.h>
|
|
|
|
-int f(int x)
|
|
+long f(long x)
|
|
|
|
commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
|
|
Author: Thomas Rast <trast@student.ethz.ch>
|
|
Date: Thu Feb 28 10:44:48 2013 +0100
|
|
|
|
initial
|
|
|
|
diff --git a/a.c b/a.c
|
|
--- /dev/null
|
|
+++ b/a.c
|
|
@@ -0,0 +1,3 @@
|
|
+#include <stdio.h>
|
|
+
|
|
+int f(int x)
|