解决冲突

adfsads
sdafs
--- a/a.txt
+++ b/a.txt
@@ -0,0 +1 @@
 ZZ
--- a/feature.txt
+++ b/feature.txt
@@ -0,0 +1,16 @@
 dsajfklsfldsklfslka
 dsfadddsd
 fadf
 ffffdfdf
 dsf

 ewr
 ew
 rew
 rwe
 rwe
 r
 ewr
 ewr
 we

--- a/one.txt
+++ b/one.txt
@@ -0,0 +1,14 @@
 aaaa

 fdsajfds
 fdsfjdslk
 dslfajadslf
 sdafldsjf

 this is two

 dsfajsdkf
 sdalfdsj
 lds

 this is one
Autor	SHA1	Mensagem	Data
unknown	586bdfc1f9	解决冲突	há 2 anos
unknown	8c0c09b5cd	adfsads	há 2 anos
unknown	a2977a7f62	sdafs	há 2 anos
unknown	2638e06587	asf	há 2 anos
unknown	398e754024	提交	há 2 anos