t / t4109 / patch1.patchon commit merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir (86273e5)
   1diff --git a/main.c b/main.c
   2new file mode 100644
   3--- /dev/null
   4+++ b/main.c
   5@@ -0,0 +1,23 @@
   6+#include <stdio.h>
   7+
   8+int func(int num);
   9+void print_int(int num);
  10+
  11+int main() {
  12+       int i;
  13+
  14+       for (i = 0; i < 10; i++) {
  15+               print_int(func(i));
  16+       }
  17+
  18+       return 0;
  19+}
  20+
  21+int func(int num) {
  22+       return num * num;
  23+}
  24+
  25+void print_int(int num) {
  26+       printf("%d", num);
  27+}
  28+