t / t4211 / expect.end-of-fileon commit Merge branch 'en/merge-options-ff-and-friends' (9bc67b6)
   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@@ -20,3 +20,5 @@
  11        printf("%ld\n", f(15));
  12        return 0;
  13-}
  14\ No newline at end of file
  15+}
  16+
  17+/* incomplete lines are bad! */
  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@@ -20,3 +20,3 @@
  29        printf("%ld\n", f(15));
  30        return 0;
  31-}
  32+}
  33\ No newline at end of file
  34
  35commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
  36Author: Thomas Rast <trast@student.ethz.ch>
  37Date:   Thu Feb 28 10:45:16 2013 +0100
  38
  39    touch both functions
  40
  41diff --git a/a.c b/a.c
  42--- a/a.c
  43+++ b/a.c
  44@@ -19,3 +19,3 @@
  45-       printf("%d\n", f(15));
  46+       printf("%ld\n", f(15));
  47        return 0;
  48 }
  49
  50commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
  51Author: Thomas Rast <trast@student.ethz.ch>
  52Date:   Thu Feb 28 10:44:48 2013 +0100
  53
  54    initial
  55
  56diff --git a/a.c b/a.c
  57--- /dev/null
  58+++ b/a.c
  59@@ -0,0 +18,3 @@
  60+       printf("%d\n", f(15));
  61+       return 0;
  62+}