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

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