t / t4211 / expect.simple-fon commit Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern-git-merge-syntax (ff65e79)
   1commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
   2Author: Thomas Rast <trast@student.ethz.ch>
   3Date:   Thu Feb 28 10:45:16 2013 +0100
   4
   5    touch both functions
   6
   7diff --git a/a.c b/a.c
   8--- a/a.c
   9+++ b/a.c
  10@@ -3,9 +3,9 @@
  11-int f(int x)
  12+long f(long x)
  13 {
  14        int s = 0;
  15        while (x) {
  16                x >>= 1;
  17                s++;
  18        }
  19        return s;
  20 }
  21
  22commit f04fb20f2c77850996cba739709acc6faecc58f7
  23Author: Thomas Rast <trast@student.ethz.ch>
  24Date:   Thu Feb 28 10:44:55 2013 +0100
  25
  26    change f()
  27
  28diff --git a/a.c b/a.c
  29--- a/a.c
  30+++ b/a.c
  31@@ -3,8 +3,9 @@
  32 int f(int x)
  33 {
  34        int s = 0;
  35        while (x) {
  36                x >>= 1;
  37                s++;
  38        }
  39+       return s;
  40 }
  41
  42commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
  43Author: Thomas Rast <trast@student.ethz.ch>
  44Date:   Thu Feb 28 10:44:48 2013 +0100
  45
  46    initial
  47
  48diff --git a/a.c b/a.c
  49--- /dev/null
  50+++ b/a.c
  51@@ -0,0 +3,8 @@
  52+int f(int x)
  53+{
  54+       int s = 0;
  55+       while (x) {
  56+               x >>= 1;
  57+               s++;
  58+       }
  59+}