Essai conflit de merge

2022-10-20 15:01:55 +02:00 · 2022-10-20 15:01:55 +02:00 · 3c01579a00
commit 3c01579a00
--- a/.test.c.swp
+++ b/.test.c.swp
--- a/test.c
+++ b/test.c
@ -1 +1,3 @@
-include <stdio.h>
+TJEQTJOZIETZHETEFNSD<NF;<DFGZEtkzesjfnsf
+include <stdio.htefzefZEEQRTYEQRYEQRYY
+ERTYEQRYTQERYKLJERYERQYOHQEROT