]> git.ipfire.org Git - thirdparty/git.git/blob - t/t4211/expect.beginning-of-file
Merge branch 'rw/apply-does-not-take-ignore-date'
[thirdparty/git.git] / t / t4211 / expect.beginning-of-file
1 commit 4a23ae5c98d59a58c6da036156959f2dc9f472ad
2 Author: Thomas Rast <trast@student.ethz.ch>
3 Date: Thu Feb 28 10:47:40 2013 +0100
4
5 change at very beginning
6
7 diff --git a/a.c b/a.c
8 --- a/a.c
9 +++ b/a.c
10 @@ -1,3 +1,4 @@
11 +#include <unistd.h>
12 #include <stdio.h>
13
14 long f(long x)
15
16 commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
17 Author: Thomas Rast <trast@student.ethz.ch>
18 Date: Thu Feb 28 10:45:16 2013 +0100
19
20 touch both functions
21
22 diff --git a/a.c b/a.c
23 --- a/a.c
24 +++ b/a.c
25 @@ -1,3 +1,3 @@
26 #include <stdio.h>
27
28 -int f(int x)
29 +long f(long x)
30
31 commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
32 Author: Thomas Rast <trast@student.ethz.ch>
33 Date: Thu Feb 28 10:44:48 2013 +0100
34
35 initial
36
37 diff --git a/a.c b/a.c
38 --- /dev/null
39 +++ b/a.c
40 @@ -0,0 +1,3 @@
41 +#include <stdio.h>
42 +
43 +int f(int x)