t / t4211 / expect.simple-main-to-endon commit Merge branch 'mm/rebase-continue-freebsd-WB' (f26f250)
   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@@ -17,5 +17,5 @@
  49 int main ()
  50 {
  51-       printf("%d\n", f(15));
  52+       printf("%ld\n", f(15));
  53        return 0;
  54 }
  55
  56commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
  57Author: Thomas Rast <trast@student.ethz.ch>
  58Date:   Thu Feb 28 10:44:48 2013 +0100
  59
  60    initial
  61
  62diff --git a/a.c b/a.c
  63--- /dev/null
  64+++ b/a.c
  65@@ -0,0 +16,5 @@
  66+int main ()
  67+{
  68+       printf("%d\n", f(15));
  69+       return 0;
  70+}