You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
160 lines
2.2 KiB
160 lines
2.2 KiB
commit 0469c60bc4837d52d97b1f081dec5f98dea20fed |
|
Merge: ba227c6 6ce3c4f |
|
Author: Thomas Rast <trast@inf.ethz.ch> |
|
Date: Fri Apr 12 16:16:24 2013 +0200 |
|
|
|
Merge across the rename |
|
|
|
|
|
commit 6ce3c4ff690136099bb17e1a8766b75764726ea7 |
|
Author: Thomas Rast <trast@student.ethz.ch> |
|
Date: Thu Feb 28 10:49:50 2013 +0100 |
|
|
|
another simple change |
|
|
|
diff --git a/b.c b/b.c |
|
--- a/b.c |
|
+++ b/b.c |
|
@@ -4,14 +4,14 @@ |
|
long f(long x) |
|
{ |
|
int s = 0; |
|
while (x) { |
|
- x >>= 1; |
|
+ x /= 2; |
|
s++; |
|
} |
|
return s; |
|
} |
|
|
|
/* |
|
* This is only an example! |
|
*/ |
|
|
|
|
|
commit ba227c6632349700fbb957dec2b50f5e2358be3f |
|
Author: Thomas Rast <trast@inf.ethz.ch> |
|
Date: Fri Apr 12 16:15:57 2013 +0200 |
|
|
|
change on another line of history while rename happens |
|
|
|
diff --git a/a.c b/a.c |
|
--- a/a.c |
|
+++ b/a.c |
|
@@ -4,14 +4,14 @@ |
|
long f(long x) |
|
{ |
|
int s = 0; |
|
while (x) { |
|
x >>= 1; |
|
s++; |
|
} |
|
return s; |
|
} |
|
|
|
/* |
|
- * This is only an example! |
|
+ * This is only a short example! |
|
*/ |
|
|
|
|
|
commit 39b6eb2d5b706d3322184a169f666f25ed3fbd00 |
|
Author: Thomas Rast <trast@student.ethz.ch> |
|
Date: Thu Feb 28 10:45:41 2013 +0100 |
|
|
|
touch comment |
|
|
|
diff --git a/a.c b/a.c |
|
--- a/a.c |
|
+++ b/a.c |
|
@@ -3,14 +3,14 @@ |
|
long f(long x) |
|
{ |
|
int s = 0; |
|
while (x) { |
|
x >>= 1; |
|
s++; |
|
} |
|
return s; |
|
} |
|
|
|
/* |
|
- * A comment. |
|
+ * This is only an example! |
|
*/ |
|
|
|
|
|
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 |
|
@@ -3,14 +3,14 @@ |
|
-int f(int x) |
|
+long f(long x) |
|
{ |
|
int s = 0; |
|
while (x) { |
|
x >>= 1; |
|
s++; |
|
} |
|
return s; |
|
} |
|
|
|
/* |
|
* A comment. |
|
*/ |
|
|
|
|
|
commit f04fb20f2c77850996cba739709acc6faecc58f7 |
|
Author: Thomas Rast <trast@student.ethz.ch> |
|
Date: Thu Feb 28 10:44:55 2013 +0100 |
|
|
|
change f() |
|
|
|
diff --git a/a.c b/a.c |
|
--- a/a.c |
|
+++ b/a.c |
|
@@ -3,13 +3,14 @@ |
|
int f(int x) |
|
{ |
|
int s = 0; |
|
while (x) { |
|
x >>= 1; |
|
s++; |
|
} |
|
+ return s; |
|
} |
|
|
|
/* |
|
* A comment. |
|
*/ |
|
|
|
|
|
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 +3,13 @@ |
|
+int f(int x) |
|
+{ |
|
+ int s = 0; |
|
+ while (x) { |
|
+ x >>= 1; |
|
+ s++; |
|
+ } |
|
+} |
|
+ |
|
+/* |
|
+ * A comment. |
|
+ */ |
|
+
|
|
|