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