t / t4211 / expect.simple-f-to-mainon commit difftool --no-index: error out on --dir-diff (and don't crash) (f3a3a02)
   1commit 39b6eb2d5b706d3322184a169f666f25ed3fbd00
   2Author: Thomas Rast <trast@student.ethz.ch>
   3Date:   Thu Feb 28 10:45:41 2013 +0100
   4
   5    touch comment
   6
   7diff --git a/a.c b/a.c
   8--- a/a.c
   9+++ b/a.c
  10@@ -3,14 +3,14 @@
  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- * A comment.
  23+ * This is only an example!
  24  */
  25 
  26
  27commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
  28Author: Thomas Rast <trast@student.ethz.ch>
  29Date:   Thu Feb 28 10:45:16 2013 +0100
  30
  31    touch both functions
  32
  33diff --git a/a.c b/a.c
  34--- a/a.c
  35+++ b/a.c
  36@@ -3,14 +3,14 @@
  37-int f(int x)
  38+long f(long x)
  39 {
  40        int s = 0;
  41        while (x) {
  42                x >>= 1;
  43                s++;
  44        }
  45        return s;
  46 }
  47 
  48 /*
  49  * A comment.
  50  */
  51 
  52
  53commit f04fb20f2c77850996cba739709acc6faecc58f7
  54Author: Thomas Rast <trast@student.ethz.ch>
  55Date:   Thu Feb 28 10:44:55 2013 +0100
  56
  57    change f()
  58
  59diff --git a/a.c b/a.c
  60--- a/a.c
  61+++ b/a.c
  62@@ -3,13 +3,14 @@
  63 int f(int x)
  64 {
  65        int s = 0;
  66        while (x) {
  67                x >>= 1;
  68                s++;
  69        }
  70+       return s;
  71 }
  72 
  73 /*
  74  * A comment.
  75  */
  76 
  77
  78commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
  79Author: Thomas Rast <trast@student.ethz.ch>
  80Date:   Thu Feb 28 10:44:48 2013 +0100
  81
  82    initial
  83
  84diff --git a/a.c b/a.c
  85--- /dev/null
  86+++ b/a.c
  87@@ -0,0 +3,13 @@
  88+int f(int x)
  89+{
  90+       int s = 0;
  91+       while (x) {
  92+               x >>= 1;
  93+               s++;
  94+       }
  95+}
  96+
  97+/*
  98+ * A comment.
  99+ */
 100+