t / t4109 / patch4.patchon commit merge-recursive: don't segfault while handling rename clashes (c94736a)
   1diff --git a/main.c b/main.c
   2--- a/main.c
   3+++ b/main.c
   4@@ -1,13 +1,14 @@
   5 #include <stdio.h>
   6 
   7 int func(int num);
   8-void print_int(int num);
   9+int func2(int num);
  10 
  11 int main() {
  12        int i;
  13 
  14        for (i = 0; i < 10; i++) {
  15-               print_int(func(i));
  16+               printf("%d", func(i));
  17+               printf("%d", func3(i));
  18        }
  19 
  20        return 0;
  21@@ -17,7 +18,7 @@
  22        return num * num;
  23 }
  24 
  25-void print_int(int num) {
  26-       printf("%d", num);
  27+int func2(int num) {
  28+       return num * num * num;
  29 }
  30