提交

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;