master
multiple-superset 194 lines 2.64 KB
Raw
1 commit 4659538844daa2849b1a9e7d6fadb96fcd26fc83
2 Author: Thomas Rast <trast@student.ethz.ch>
3 Date: Thu Feb 28 10:48:43 2013 +0100
4
5 change back to complete line
6
7 diff --git a/a.c b/a.c
8 index 0b9cae5..5de3ea4 100644
9 --- a/a.c
10 +++ b/a.c
11 @@ -4,19 +4,21 @@
12 long f(long x)
13 {
14 int s = 0;
15 while (x) {
16 x >>= 1;
17 s++;
18 }
19 return s;
20 }
21
22 /*
23 * This is only an example!
24 */
25
26 int main ()
27 {
28 printf("%ld\n", f(15));
29 return 0;
30 -}
31 \ No newline at end of file
32 +}
33 +
34 +/* incomplete lines are bad! */
35
36 commit 100b61a6f2f720f812620a9d10afb3a960ccb73c
37 Author: Thomas Rast <trast@student.ethz.ch>
38 Date: Thu Feb 28 10:48:10 2013 +0100
39
40 change to an incomplete line at end
41
42 diff --git a/a.c b/a.c
43 index 5e709a1..0b9cae5 100644
44 --- a/a.c
45 +++ b/a.c
46 @@ -4,19 +4,19 @@
47 long f(long x)
48 {
49 int s = 0;
50 while (x) {
51 x >>= 1;
52 s++;
53 }
54 return s;
55 }
56
57 /*
58 * This is only an example!
59 */
60
61 int main ()
62 {
63 printf("%ld\n", f(15));
64 return 0;
65 -}
66 +}
67 \ No newline at end of file
68
69 commit 39b6eb2d5b706d3322184a169f666f25ed3fbd00
70 Author: Thomas Rast <trast@student.ethz.ch>
71 Date: Thu Feb 28 10:45:41 2013 +0100
72
73 touch comment
74
75 diff --git a/a.c b/a.c
76 index e51de13..bdb2bb1 100644
77 --- a/a.c
78 +++ b/a.c
79 @@ -3,19 +3,19 @@
80 long f(long x)
81 {
82 int s = 0;
83 while (x) {
84 x >>= 1;
85 s++;
86 }
87 return s;
88 }
89
90 /*
91 - * A comment.
92 + * This is only an example!
93 */
94
95 int main ()
96 {
97 printf("%ld\n", f(15));
98 return 0;
99 }
100
101 commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
102 Author: Thomas Rast <trast@student.ethz.ch>
103 Date: Thu Feb 28 10:45:16 2013 +0100
104
105 touch both functions
106
107 diff --git a/a.c b/a.c
108 index 3233403..e51de13 100644
109 --- a/a.c
110 +++ b/a.c
111 @@ -3,19 +3,19 @@
112 -int f(int x)
113 +long f(long x)
114 {
115 int s = 0;
116 while (x) {
117 x >>= 1;
118 s++;
119 }
120 return s;
121 }
122
123 /*
124 * A comment.
125 */
126
127 int main ()
128 {
129 - printf("%d\n", f(15));
130 + printf("%ld\n", f(15));
131 return 0;
132 }
133
134 commit f04fb20f2c77850996cba739709acc6faecc58f7
135 Author: Thomas Rast <trast@student.ethz.ch>
136 Date: Thu Feb 28 10:44:55 2013 +0100
137
138 change f()
139
140 diff --git a/a.c b/a.c
141 index 444e415..3233403 100644
142 --- a/a.c
143 +++ b/a.c
144 @@ -3,18 +3,19 @@
145 int f(int x)
146 {
147 int s = 0;
148 while (x) {
149 x >>= 1;
150 s++;
151 }
152 + return s;
153 }
154
155 /*
156 * A comment.
157 */
158
159 int main ()
160 {
161 printf("%d\n", f(15));
162 return 0;
163 }
164
165 commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
166 Author: Thomas Rast <trast@student.ethz.ch>
167 Date: Thu Feb 28 10:44:48 2013 +0100
168
169 initial
170
171 diff --git a/a.c b/a.c
172 new file mode 100644
173 index 0000000..444e415
174 --- /dev/null
175 +++ b/a.c
176 @@ -0,0 +3,18 @@
177 +int f(int x)
178 +{
179 + int s = 0;
180 + while (x) {
181 + x >>= 1;
182 + s++;
183 + }
184 +}
185 +
186 +/*
187 + * A comment.
188 + */
189 +
190 +int main ()
191 +{
192 + printf("%d\n", f(15));
193 + return 0;
194 +}