添加新内容

This reverts commit 3b727f6c92.

hello.c

@@ -7,7 +7,8 @@ void main()
     printf("hello world\n");
     printf("hello world\n");
     printf("nihao\n");
-    printf("helloworld\n");
+    printf("你好\n");
     printf("haode\n");
+    printf("添加新内容\n");
     return 0;    
 }

hello.c.rej

@@ -0,0 +1,15 @@
+diff a/hello.c b/hello.c	(rejected hunks)
+@@ -2,10 +2,13 @@
+ 
+ void main()
+ {
++<<<<<<< HEAD
+     printf("hello world\n");
+     printf("hello world\n");
+     printf("hello world\n");
+     printf("hello world\n");
++=======
++>>>>>>> 20bf8d7c8a17a7354dfe3d735a034ad3ffe96ba5
+     printf("nihao\n");
+     printf("helloworld");
+     return 0;