Andrew's git - gitweb.git/blob - t/t4211/expect.multiple

   1commit 4659538844daa2849b1a9e7d6fadb96fcd26fc83
   2Author: Thomas Rast <trast@student.ethz.ch>
   3Date:   Thu Feb 28 10:48:43 2013 +0100
   4
   5    change back to complete line
   6
   7diff --git a/a.c b/a.c
   8--- a/a.c
   9+++ b/a.c
  10@@ -18,5 +18,7 @@
  11 int main ()
  12 {
  13        printf("%ld\n", f(15));
  14        return 0;
  15-}
  16\ No newline at end of file
  17+}
  18+
  19+/* incomplete lines are bad! */
  20
  21commit 100b61a6f2f720f812620a9d10afb3a960ccb73c
  22Author: Thomas Rast <trast@student.ethz.ch>
  23Date:   Thu Feb 28 10:48:10 2013 +0100
  24
  25    change to an incomplete line at end
  26
  27diff --git a/a.c b/a.c
  28--- a/a.c
  29+++ b/a.c
  30@@ -18,5 +18,5 @@
  31 int main ()
  32 {
  33        printf("%ld\n", f(15));
  34        return 0;
  35-}
  36+}
  37\ No newline at end of file
  38
  39commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
  40Author: Thomas Rast <trast@student.ethz.ch>
  41Date:   Thu Feb 28 10:45:16 2013 +0100
  42
  43    touch both functions
  44
  45diff --git a/a.c b/a.c
  46--- a/a.c
  47+++ b/a.c
  48@@ -3,9 +3,9 @@
  49-int f(int x)
  50+long f(long x)
  51 {
  52        int s = 0;
  53        while (x) {
  54                x >>= 1;
  55                s++;
  56        }
  57        return s;
  58 }
  59@@ -17,5 +17,5 @@
  60 int main ()
  61 {
  62-       printf("%d\n", f(15));
  63+       printf("%ld\n", f(15));
  64        return 0;
  65 }
  66
  67commit f04fb20f2c77850996cba739709acc6faecc58f7
  68Author: Thomas Rast <trast@student.ethz.ch>
  69Date:   Thu Feb 28 10:44:55 2013 +0100
  70
  71    change f()
  72
  73diff --git a/a.c b/a.c
  74--- a/a.c
  75+++ b/a.c
  76@@ -3,8 +3,9 @@
  77 int f(int x)
  78 {
  79        int s = 0;
  80        while (x) {
  81                x >>= 1;
  82                s++;
  83        }
  84+       return s;
  85 }
  86
  87commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
  88Author: Thomas Rast <trast@student.ethz.ch>
  89Date:   Thu Feb 28 10:44:48 2013 +0100
  90
  91    initial
  92
  93diff --git a/a.c b/a.c
  94--- /dev/null
  95+++ b/a.c
  96@@ -0,0 +3,8 @@
  97+int f(int x)
  98+{
  99+       int s = 0;
 100+       while (x) {
 101+               x >>= 1;
 102+               s++;
 103+       }
 104+}